aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-09 15:23:57 -0700
committerLeann Ogasawara <leann.ogasawara@canonical.com>2012-06-19 00:03:15 -0700
commitf0b0e32807f8fe5f0116088323bb44e75641fe66 (patch)
tree7826f48ba4ac16cde1bc76c04b437e066e92fb60
parentece5854d38e2d8c293fcb04c2cd1171bf4544325 (diff)
UBUNTU: [Config] Temporarily disable CONFIG_HW_RANDOM_ATMEL on armhf
Build failure: ERROR: "clk_disable" [drivers/char/hw_random/atmel-rng.ko] undefined! ERROR: "clk_enable" [drivers/char/hw_random/atmel-rng.ko] undefined! Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
-rw-r--r--debian.master/config/armel/config.common.armel1
-rw-r--r--debian.master/config/armhf/config.common.armhf1
-rw-r--r--debian.master/config/config.common.ubuntu1
3 files changed, 2 insertions, 1 deletions
diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel
index 372a34872fb..f1fc4bc00a9 100644
--- a/debian.master/config/armel/config.common.armel
+++ b/debian.master/config/armel/config.common.armel
@@ -88,6 +88,7 @@ CONFIG_HTC_EGPIO=y
CONFIG_HTC_I2CPLD=y
# CONFIG_HUGETLB_PAGE is not set
CONFIG_HVC_DCC=y
+CONFIG_HW_RANDOM_ATMEL=m
CONFIG_HZ=128
CONFIG_I2C_ALGOBIT=m
CONFIG_I2C_DESIGNWARE_PLATFORM=m
diff --git a/debian.master/config/armhf/config.common.armhf b/debian.master/config/armhf/config.common.armhf
index af4ca3caa84..2b3d3abe00d 100644
--- a/debian.master/config/armhf/config.common.armhf
+++ b/debian.master/config/armhf/config.common.armhf
@@ -42,6 +42,7 @@ CONFIG_GPIO_TWL4030=y
CONFIG_HAVE_AOUT=y
CONFIG_HAVE_GENERIC_DMA_COHERENT=y
# CONFIG_HUGETLB_PAGE is not set
+# CONFIG_HW_RANDOM_ATMEL is not set
CONFIG_I2C_ALGOBIT=m
# CONFIG_IWMC3200TOP_DEBUGFS is not set
CONFIG_KGDB=y
diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu
index c537b279c45..b31e71b0dc5 100644
--- a/debian.master/config/config.common.ubuntu
+++ b/debian.master/config/config.common.ubuntu
@@ -2243,7 +2243,6 @@ CONFIG_HW_CONSOLE=y
CONFIG_HW_PERF_EVENTS=y
CONFIG_HW_RANDOM=y
CONFIG_HW_RANDOM_AMD=m
-CONFIG_HW_RANDOM_ATMEL=m
CONFIG_HW_RANDOM_GEODE=m
CONFIG_HW_RANDOM_INTEL=m
CONFIG_HW_RANDOM_PASEMI=m