diff options
| author | Leann Ogasawara <leann.ogasawara@canonical.com> | 2011-07-18 12:57:08 -0700 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2011-07-25 14:41:24 -0600 |
| commit | b83e1062fac231295bbe0cac80ba316fc4c9bcfb (patch) | |
| tree | a342610f4037582431be2f2d446609c1a70270f6 | |
| parent | ad95140086fac63d814b9bcee17fa14ea58f7408 (diff) | |
UBUNTU: [Config] Set CONFIG_AD7152=m on arm
Per the non-modular module review, enable CONFIG_AD7152=m on arm for
consistency across all flavors. Was likely disabled due to previous
build failures.
Signed-off-by: Leann Ogasawara <leann.ogasawara@canonical.com>
| -rw-r--r-- | debian.master/config/amd64/config.common.amd64 | 1 | ||||
| -rw-r--r-- | debian.master/config/armel/config.common.armel | 1 | ||||
| -rw-r--r-- | debian.master/config/config.common.ubuntu | 1 | ||||
| -rw-r--r-- | debian.master/config/i386/config.common.i386 | 1 |
4 files changed, 1 insertions, 3 deletions
diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index 23b0acdfa9b..8576cf2ef03 100644 --- a/debian.master/config/amd64/config.common.amd64 +++ b/debian.master/config/amd64/config.common.amd64 @@ -3,7 +3,6 @@ # CONFIG_64BIT=y CONFIG_ACPI_BLACKLIST_YEAR=0 -CONFIG_AD7152=m CONFIG_AIC79XX_RESET_DELAY_MS=5000 CONFIG_ALIM7101_WDT=m CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index a311a06bd5c..fdb3cfdfe60 100644 --- a/debian.master/config/armel/config.common.armel +++ b/debian.master/config/armel/config.common.armel @@ -1,7 +1,6 @@ # # Config options for config.common.armel automatically generated by splitconfig.pl # -# CONFIG_AD7152 is not set CONFIG_AIC79XX_RESET_DELAY_MS=5000 # CONFIG_APM_EMULATION is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index 6391e7aea9b..82d3ddcd122 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -96,6 +96,7 @@ CONFIG_AD5624R_SPI=m CONFIG_AD5791=m CONFIG_AD5930=m CONFIG_AD7150=m +CONFIG_AD7152=m CONFIG_AD7291=m CONFIG_AD7298=m CONFIG_AD7314=m diff --git a/debian.master/config/i386/config.common.i386 b/debian.master/config/i386/config.common.i386 index b4998c5d7a5..36a62e41a9b 100644 --- a/debian.master/config/i386/config.common.i386 +++ b/debian.master/config/i386/config.common.i386 @@ -3,7 +3,6 @@ # # CONFIG_64BIT is not set CONFIG_ACPI_BLACKLIST_YEAR=2000 -CONFIG_AD7152=m CONFIG_AIC79XX_RESET_DELAY_MS=5000 CONFIG_ALIM7101_WDT=m CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" |