CHROMIUM: config: re-normalize split configs

No changes, just running "kernelconfig oldconfig", no questions were
asked.

BUG=none
TEST=none

Change-Id: I5f7e7dee8063a3941c4cb4340462539f75bd5890
Signed-off-by: Olof Johansson <olofj@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/20497
Reviewed-by: Anush Elangovan <anush@chromium.org>

diff --git a/chromeos/config/armel/common.config b/chromeos/config/armel/common.config
index a6c5129..3b9a087 100644 (file)
--- a/chromeos/config/armel/common.config
+++ b/chromeos/config/armel/common.config
@@ -405,7 +405,6 @@ CONFIG_TEGRA_PWM=y
 CONFIG_TEGRA_RPC=y
 CONFIG_TEGRA_SYSTEM_DMA=y
 # CONFIG_THUMB2_KERNEL is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TOUCHSCREEN_W90X900 is not set
 # CONFIG_UACCESS_WITH_MEMCPY is not set
 # CONFIG_USB_ARCH_HAS_OHCI is not set

diff --git a/chromeos/config/base.config b/chromeos/config/base.config
index 8af6c27..4355361 100644 (file)
--- a/chromeos/config/base.config
+++ b/chromeos/config/base.config
@@ -1372,7 +1372,6 @@ CONFIG_SND_DRIVERS=y
 CONFIG_SND_DYNAMIC_MINORS=y
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_HRTIMER=m
-CONFIG_SND_HWDEP=m
 CONFIG_SND_JACK=y
 # CONFIG_SND_MIXER_OSS is not set
 # CONFIG_SND_MPU401 is not set
@@ -1380,8 +1379,7 @@ CONFIG_SND_JACK=y
 # CONFIG_SND_OPL3_LIB_SEQ is not set
 # CONFIG_SND_OPL4_LIB_SEQ is not set
 # CONFIG_SND_PCM_OSS is not set
-CONFIG_SND_RAWMIDI=m
-CONFIG_SND_RAWMIDI_SEQ=m
+# CONFIG_SND_RAWMIDI_SEQ is not set
 # CONFIG_SND_SBAWE_SEQ is not set
 CONFIG_SND_SEQUENCER=m
 # CONFIG_SND_SEQUENCER_OSS is not set
@@ -1391,10 +1389,6 @@ CONFIG_SND_SEQ_HRTIMER_DEFAULT=y
 # CONFIG_SND_SPI is not set
 CONFIG_SND_SUPPORT_OLD_API=y
 # CONFIG_SND_USB is not set
-# CONFIG_SND_USB_6FIRE is not set
-# CONFIG_SND_USB_AUDIO is not set
-# CONFIG_SND_USB_CAIAQ is not set
-# CONFIG_SND_USB_UA101 is not set
 # CONFIG_SND_VERBOSE_PRINTK is not set
 CONFIG_SND_VERBOSE_PROCFS=y
 # CONFIG_SND_VIRMIDI is not set
@@ -1479,6 +1473,7 @@ CONFIG_TMPFS_XATTR=y
 # CONFIG_TOUCHSCREEN_AD7877 is not set
 # CONFIG_TOUCHSCREEN_AD7879 is not set
 # CONFIG_TOUCHSCREEN_ADS7846 is not set
+CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TOUCHSCREEN_BU21013 is not set
 # CONFIG_TOUCHSCREEN_CLEARPAD_TM1217 is not set
 # CONFIG_TOUCHSCREEN_CY8CTMG110 is not set

diff --git a/chromeos/config/i386/common.config b/chromeos/config/i386/common.config
index 125f1a0..953939e 100644 (file)
--- a/chromeos/config/i386/common.config
+++ b/chromeos/config/i386/common.config
@@ -767,6 +767,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_HDA_RECONFIG is not set
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
+CONFIG_SND_HWDEP=m
 # CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set
 # CONFIG_SND_INDIGO is not set
@@ -799,8 +800,6 @@ CONFIG_SND_PCM=m
 # CONFIG_SND_SONICVIBES is not set
 CONFIG_SND_TIMER=m
 # CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
 # CONFIG_SND_VIA82XX is not set
 # CONFIG_SND_VIA82XX_MODEM is not set
 # CONFIG_SND_VIRTUOSO is not set
@@ -829,7 +828,6 @@ CONFIG_TCG_TIS=y
 # CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TOSHIBA is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TR is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 CONFIG_USB_ARCH_HAS_OHCI=y

diff --git a/chromeos/config/x86_64/common.config b/chromeos/config/x86_64/common.config
index a56ff3a..a6b1190 100644 (file)
--- a/chromeos/config/x86_64/common.config
+++ b/chromeos/config/x86_64/common.config
@@ -795,6 +795,7 @@ CONFIG_SND_HDA_PREALLOC_SIZE=64
 # CONFIG_SND_HDA_RECONFIG is not set
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
+CONFIG_SND_HWDEP=m
 # CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set
 # CONFIG_SND_INDIGO is not set
@@ -826,8 +827,6 @@ CONFIG_SND_PCM=m
 # CONFIG_SND_SONICVIBES is not set
 CONFIG_SND_TIMER=m
 # CONFIG_SND_TRIDENT is not set
-# CONFIG_SND_USB_US122L is not set
-# CONFIG_SND_USB_USX2Y is not set
 # CONFIG_SND_VIA82XX is not set
 # CONFIG_SND_VIA82XX_MODEM is not set
 # CONFIG_SND_VIRTUOSO is not set
@@ -859,7 +858,6 @@ CONFIG_TCG_TIS=y
 # CONFIG_TIFM_CORE is not set
 # CONFIG_TOPSTAR_LAPTOP is not set
 # CONFIG_TOSHIBA_BT_RFKILL is not set
-CONFIG_TOUCHSCREEN_ATMEL_MXT=m
 # CONFIG_TR is not set
 # CONFIG_TRANSPARENT_HUGEPAGE is not set
 # CONFIG_USBPCWATCHDOG is not set