From: Nicolas Thill <nico@openwrt.org>
Date: Tue, 6 Oct 2009 02:25:15 +0000 (+0000)
Subject: move more CONFIG_SND entries to generic
X-Git-Tag: v19.07.0-rc1~32903
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=5b8e48f93a09cc93227912144e2c50b8bf25cc74;p=openwrt%2Fstaging%2Fhauke.git

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 9a581a0f37..e48fceca40 100644
--- 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 78d5e46acc..e70a735532 100644
--- 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 8a1583852d..973125587d 100644
--- 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 84bbc06732..b2910d0f5a 100644
--- 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 7b28ce6bc1..c877c1b836 100644
--- 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 b07d305578..be0a64ffd6 100644
--- 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 9807446614..436f32ef3d 100644
--- 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 93329e3ab5..f5c18dd4a4 100644
--- 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 c83291c9fa..5b77fb1d31 100644
--- 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 d1cb3092dd..eb0d952f61 100644
--- 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