From ad95140086fac63d814b9bcee17fa14ea58f7408 Mon Sep 17 00:00:00 2001 From: Leann Ogasawara Date: Mon, 18 Jul 2011 12:53:39 -0700 Subject: UBUNTU: [Config] Set CONFIG_AD7150=m on arm Per the non-modular module review, enable CONFIG_AD7150=m on arm for consistency across all flavors. Was likely disabled due to previous build failures. Signed-off-by: Leann Ogasawara --- debian.master/config/amd64/config.common.amd64 | 1 - debian.master/config/armel/config.common.armel | 1 - debian.master/config/config.common.ubuntu | 1 + debian.master/config/i386/config.common.i386 | 1 - 4 files changed, 1 insertion(+), 3 deletions(-) diff --git a/debian.master/config/amd64/config.common.amd64 b/debian.master/config/amd64/config.common.amd64 index eea6ca9571d..23b0acdfa9b 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_AD7150=m CONFIG_AD7152=m CONFIG_AIC79XX_RESET_DELAY_MS=5000 CONFIG_ALIM7101_WDT=m diff --git a/debian.master/config/armel/config.common.armel b/debian.master/config/armel/config.common.armel index 9f7e05fb957..a311a06bd5c 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_AD7150 is not set # CONFIG_AD7152 is not set CONFIG_AIC79XX_RESET_DELAY_MS=5000 # CONFIG_APM_EMULATION is not set diff --git a/debian.master/config/config.common.ubuntu b/debian.master/config/config.common.ubuntu index fd0bd24e776..6391e7aea9b 100644 --- a/debian.master/config/config.common.ubuntu +++ b/debian.master/config/config.common.ubuntu @@ -95,6 +95,7 @@ CONFIG_AD5504=m CONFIG_AD5624R_SPI=m CONFIG_AD5791=m CONFIG_AD5930=m +CONFIG_AD7150=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 ed1657c61ff..b4998c5d7a5 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_AD7150=m CONFIG_AD7152=m CONFIG_AIC79XX_RESET_DELAY_MS=5000 CONFIG_ALIM7101_WDT=m -- cgit v1.2.3