[kernel] move more CONFIG_SND entries to generic

SVN-Revision: 17942

diff --git a/target/linux/at91/config-2.6.25 b/target/linux/at91/config-2.6.25
index 9a581a0f37ea2c098e77970adf0696e643f4b02f..e48fceca40be5ca46027776fdbdd6d4329bbbe63 100644 (file)
--- a/target/linux/at91/config-2.6.25
+++ b/target/linux/at91/config-2.6.25
@@ -159,7 +159,6 @@ CONFIG_SERIO_RAW=y
 CONFIG_SERIO_SERPORT=y
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
-# CONFIG_SOUND is not set
 # CONFIG_SPI_AT91 is not set
 # CONFIG_SPI_ATMEL is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096

diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index 78d5e46accc3ea1f95753073550cd4329d4a4423..e70a735532fc3a69806f766a48455441a296e37e 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -1762,6 +1762,7 @@ CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_PCM is not set
 # CONFIG_SND_PCM_OSS is not set
 CONFIG_SND_PCM_OSS_PLUGINS=y
+# CONFIG_SND_PCSP is not set
 # CONFIG_SND_PCXHR is not set
 # CONFIG_SND_PDAUDIOCF is not set
 # CONFIG_SND_RAWMIDI is not set
@@ -1776,6 +1777,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
 # CONFIG_SND_SEQUENCER is not set
 # CONFIG_SND_SERIAL_U16550 is not set
 # CONFIG_SND_SGALAXY is not set
+# CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_SOC is not set
 # CONFIG_SND_SONICVIBES is not set
 # CONFIG_SND_SPI is not set

diff --git a/target/linux/generic-2.6/config-2.6.28 b/target/linux/generic-2.6/config-2.6.28
index 8a1583852d150366269eb73077145a559c613bfb..973125587dde48d8cc171e6e3803607d59382c9a 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.28
+++ b/target/linux/generic-2.6/config-2.6.28
@@ -1715,6 +1715,8 @@ CONFIG_SLAB=y
 # CONFIG_SND_ALS100 is not set
 # CONFIG_SND_ALS300 is not set
 # CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_AW2 is not set
 # CONFIG_SND_ATIIXP is not set
 # CONFIG_SND_ATIIXP_MODEM is not set
 # CONFIG_SND_AU8810 is not set

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 84bbc06732a390bb08d1c5d1ad14ac5631fe25d7..b2910d0f5a2c06e9f9eece9ef9c9007cc6dea22d 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -1891,6 +1891,7 @@ CONFIG_SLAB=y
 # CONFIG_SND_AU8810 is not set
 # CONFIG_SND_AU8820 is not set
 # CONFIG_SND_AU8830 is not set
+# CONFIG_SND_ARM is not set
 # CONFIG_SND_AW2 is not set
 # CONFIG_SND_AZT2320 is not set
 # CONFIG_SND_AZT3328 is not set

diff --git a/target/linux/generic-2.6/config-2.6.31 b/target/linux/generic-2.6/config-2.6.31
index 7b28ce6bc1572b587de909349c674c678249c322..c877c1b836e47878f8c82cc146eca1f5124ba2c3 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -1932,6 +1932,8 @@ CONFIG_SLABINFO=y
 # CONFIG_SND_ALS100 is not set
 # CONFIG_SND_ALS300 is not set
 # CONFIG_SND_ALS4000 is not set
+# CONFIG_SND_ARM is not set
+# CONFIG_SND_AW2 is not set
 # CONFIG_SND_ATIIXP is not set
 # CONFIG_SND_ATIIXP_MODEM is not set
 # CONFIG_SND_AU8810 is not set

diff --git a/target/linux/iop32x/config-default b/target/linux/iop32x/config-default
index b07d30557888802cb6e9a25a86857ee846ba18d0..be0a64ffd6e7a80ba94b2d8469d8dfa95d0ad6b1 100644 (file)
--- a/target/linux/iop32x/config-default
+++ b/target/linux/iop32x/config-default
@@ -183,8 +183,6 @@ CONFIG_RTC_DRV_X1205=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SOUND is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 # CONFIG_TICK_ONESHOT is not set

diff --git a/target/linux/ixp4xx/config-2.6.28 b/target/linux/ixp4xx/config-2.6.28
index 98074466143b33b705e93f4f706a27af1e1d6ec1..436f32ef3d9f77f2e465338a6197faeaae66c2c3 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.28
+++ b/target/linux/ixp4xx/config-2.6.28
@@ -195,7 +195,6 @@ CONFIG_SENSORS_W83781D=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 CONFIG_SLABINFO=y
-# CONFIG_SND_ARM is not set
 CONFIG_SND_USB=y
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

diff --git a/target/linux/olpc/config-2.6.27 b/target/linux/olpc/config-2.6.27
index 93329e3ab51827fa85f3f1f945c67d4cd96f41fc..f5c18dd4a4c14e50555498a0b4f16336466acebd 100644 (file)
--- a/target/linux/olpc/config-2.6.27
+++ b/target/linux/olpc/config-2.6.27
@@ -477,10 +477,7 @@ CONFIG_SND_HDA_GENERIC=y
 CONFIG_SND_HDA_HWDEP=y
 # CONFIG_SND_HDA_INTEL is not set
 # CONFIG_SND_HDA_POWER_SAVE is not set
-# CONFIG_SND_MIXER_OSS is not set
 CONFIG_SND_PCI=y
-# CONFIG_SND_PCSP is not set
-# CONFIG_SND_SIS7019 is not set
 # CONFIG_SND_USB is not set
 CONFIG_SND_VMASTER=y
 # CONFIG_SONYPI is not set

diff --git a/target/linux/orion/config-default b/target/linux/orion/config-default
index c83291c9fa415238f76b4e73b3d049ab7609a804..5b77fb1d312c7265ca8d30a338c506d3de436397 100644 (file)
--- a/target/linux/orion/config-default
+++ b/target/linux/orion/config-default
@@ -203,10 +203,7 @@ CONFIG_SATA_PMP=y
 # CONFIG_SERIAL_8250_EXTENDED is not set
 CONFIG_SLABINFO=y
 # CONFIG_SMC91X is not set
-# CONFIG_SND_ARM is not set
-# CONFIG_SND_AW2 is not set
 # CONFIG_SOC_CAMERA is not set
-# CONFIG_SOUND is not set
 # CONFIG_SPI_ORION is not set
 CONFIG_SPLIT_PTLOCK_CPUS=4096
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y

diff --git a/target/linux/s3c24xx/config-2.6.31 b/target/linux/s3c24xx/config-2.6.31
index d1cb3092dd295a886f1d04e99cfe29f8bc6e717f..eb0d952f61687845f702ffd18710db9b99d8ceba 100644 (file)
--- a/target/linux/s3c24xx/config-2.6.31
+++ b/target/linux/s3c24xx/config-2.6.31
@@ -339,7 +339,6 @@ CONFIG_SERIO=y
 # CONFIG_SLOW_WORK is not set
 # CONFIG_SMARTJOYPLUS_FF is not set
 CONFIG_SND=m
-# CONFIG_SND_ARM is not set
 # CONFIG_SND_DRIVERS is not set
 # CONFIG_SND_EMU10K1_SEQ is not set
 CONFIG_SND_JACK=y