aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2010-03-21 13:57:07 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2010-03-21 13:57:07 +0000
commitc1f9037135732a27ed9618925a8cfc714abc6a49 (patch)
tree2b2004eeeb5219130a35231e61de3221a29612b6 /target/linux/generic-2.6
parente9615a0d36b3c614fe21575a3058810830e863bd (diff)
downloadupstream-c1f9037135732a27ed9618925a8cfc714abc6a49.tar.gz
upstream-c1f9037135732a27ed9618925a8cfc714abc6a49.tar.bz2
upstream-c1f9037135732a27ed9618925a8cfc714abc6a49.zip
kernel: Add some missing config symbols
This adds some missing config symbols and opens the menu behind CONFIG_SND_PCI and CONFIG_ISDN. SVN-Revision: 20339
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/config-2.6.3033
-rw-r--r--target/linux/generic-2.6/config-2.6.3127
-rw-r--r--target/linux/generic-2.6/config-2.6.3232
-rw-r--r--target/linux/generic-2.6/config-2.6.3330
-rw-r--r--target/linux/generic-2.6/config-2.6.3430
5 files changed, 142 insertions, 10 deletions
diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 0379ce239e..1cbb6abcaa 100644
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -154,8 +154,10 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_CPQ_CISS_DA is not set
# CONFIG_BLK_CPQ_DA is not set
# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_AEC62XX is not set
# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_ALI14XX is not set
# CONFIG_BLK_DEV_AMD74XX is not set
# CONFIG_BLK_DEV_ATIIXP is not set
# CONFIG_BLK_DEV_BSG is not set
@@ -169,6 +171,7 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_DEV_CS5535 is not set
# CONFIG_BLK_DEV_CS5536 is not set
# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_DTC2278 is not set
# CONFIG_BLK_DEV_DELKIN is not set
# CONFIG_BLK_DEV_FD is not set
# CONFIG_BLK_DEV_GENERIC is not set
@@ -177,6 +180,7 @@ CONFIG_BINFMT_ELF=y
# CONFIG_BLK_DEV_HD_ONLY is not set
# CONFIG_BLK_DEV_HPT34X is not set
# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_HT6560B is not set
# CONFIG_BLK_DEV_IDEACPI is not set
# CONFIG_BLK_DEV_IDECD is not set
# CONFIG_BLK_DEV_IDECS is not set
@@ -203,6 +207,7 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_BLK_DEV_PDC202XX_OLD is not set
# CONFIG_BLK_DEV_PIIX is not set
# CONFIG_BLK_DEV_PLATFORM is not set
+# CONFIG_BLK_DEV_QD65XX is not set
# CONFIG_BLK_DEV_RAM is not set
# CONFIG_BLK_DEV_RZ1000 is not set
# CONFIG_BLK_DEV_SC1200 is not set
@@ -218,6 +223,7 @@ CONFIG_BLK_DEV_INITRD=y
# CONFIG_BLK_DEV_TRIFLEX is not set
# CONFIG_BLK_DEV_TRM290 is not set
# CONFIG_BLK_DEV_UB is not set
+# CONFIG_BLK_DEV_UMC8672 is not set
# CONFIG_BLK_DEV_UMEM is not set
# CONFIG_BLK_DEV_VIA82CXXX is not set
# CONFIG_BLK_DEV_XIP is not set
@@ -324,6 +330,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
# CONFIG_CONFIGFS_FS is not set
# CONFIG_CONNECTOR is not set
# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_FREQ is not set
@@ -618,6 +625,7 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_DEVICE is not set
@@ -699,6 +707,7 @@ CONFIG_HOTPLUG=y
# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYSDN is not set
CONFIG_HZ=100
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
@@ -997,7 +1006,20 @@ CONFIG_IPW2200_MONITOR=y
# CONFIG_IRDA is not set
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_WITH_ABC is not set
# CONFIG_ISL29003 is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_IWL3945 is not set
@@ -1097,6 +1119,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LOGITECH_FF is not set
# CONFIG_LSF is not set
# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
# CONFIG_LXT_PHY is not set
# CONFIG_MAC80211 is not set
# CONFIG_MAC_EMUMOUSEBTN is not set
@@ -1825,6 +1848,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_MPT2SAS is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NETLINK is not set
# CONFIG_SCSI_NSP32 is not set
@@ -2010,6 +2034,7 @@ CONFIG_SLAB=y
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_DEBUG is not set
@@ -2042,7 +2067,9 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
@@ -2053,6 +2080,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_MIPS is not set
@@ -2069,7 +2097,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_OPTI93X is not set
CONFIG_SND_OSSEMUL=y
# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCI is not set
+CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
# CONFIG_SND_PCM is not set
# CONFIG_SND_PCM_OSS is not set
@@ -2088,6 +2116,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIS7019 is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SOC is not set
# CONFIG_SND_SONICVIBES 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 320ccb928c..f42f7d668e 100644
--- a/target/linux/generic-2.6/config-2.6.31
+++ b/target/linux/generic-2.6/config-2.6.31
@@ -337,6 +337,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
# CONFIG_CONNECTOR is not set
CONFIG_CONSTRUCTORS=y
# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_FREQ is not set
@@ -606,6 +607,7 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_DEVICE is not set
@@ -696,6 +698,7 @@ CONFIG_HOTPLUG=y
# CONFIG_HW_RANDOM_INTEL is not set
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIA is not set
+# CONFIG_HYSDN is not set
CONFIG_HZ=100
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
@@ -995,7 +998,20 @@ CONFIG_IPW2200_MONITOR=y
# CONFIG_IRDA is not set
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_WITH_ABC is not set
# CONFIG_ISL29003 is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_IWL3945 is not set
@@ -1099,6 +1115,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LOGO is not set
# CONFIG_LSF is not set
# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
# CONFIG_LXT_PHY is not set
CONFIG_MAC80211_DEFAULT_PS_VALUE=1
CONFIG_MAC80211_DEFAULT_PS=y
@@ -1835,6 +1852,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_MPT2SAS is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NETLINK is not set
# CONFIG_SCSI_NSP32 is not set
@@ -2024,6 +2042,7 @@ CONFIG_SLAB=y
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_DEBUG is not set
@@ -2056,7 +2075,9 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
@@ -2067,6 +2088,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_MIPS is not set
@@ -2083,7 +2105,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_OPTI93X is not set
CONFIG_SND_OSSEMUL=y
# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCI is not set
+CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
# CONFIG_SND_PCM is not set
# CONFIG_SND_PCM_OSS is not set
@@ -2101,6 +2123,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIS7019 is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SOC is not set
# CONFIG_SND_SONICVIBES is not set
diff --git a/target/linux/generic-2.6/config-2.6.32 b/target/linux/generic-2.6/config-2.6.32
index 5dff3ffed5..3fdf530a93 100644
--- a/target/linux/generic-2.6/config-2.6.32
+++ b/target/linux/generic-2.6/config-2.6.32
@@ -5,6 +5,7 @@
# CONFIG_AB3100_CORE is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACENIC is not set
+# CONFIG_ACPI_POWER_METER is not set
# CONFIG_ACORN_PARTITION is not set
# CONFIG_ADAPTEC_STARFIRE is not set
# CONFIG_ADFS_FS is not set
@@ -344,6 +345,7 @@ CONFIG_COMPAT_NET_DEV_OPS=y
# CONFIG_CONNECTOR is not set
CONFIG_CONSTRUCTORS=y
# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_COPS is not set
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
# CONFIG_CPU_DCACHE_DISABLE is not set
# CONFIG_CPU_FREQ is not set
@@ -653,6 +655,7 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_GPIO_BT8XX is not set
# CONFIG_GPIO_DEVICE is not set
@@ -747,6 +750,7 @@ CONFIG_HOTPLUG=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIA is not set
# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
CONFIG_HZ=100
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
@@ -787,6 +791,7 @@ CONFIG_HZ_100=y
# CONFIG_I2C_PIIX4 is not set
# CONFIG_I2C_PROSAVAGE is not set
# CONFIG_I2C_SAVAGE4 is not set
+# CONFIG_I2C_SCMI is not set
# CONFIG_I2C_SIMTEC is not set
# CONFIG_I2C_SIS5595 is not set
# CONFIG_I2C_SIS630 is not set
@@ -1050,7 +1055,20 @@ CONFIG_IPW2200_MONITOR=y
# CONFIG_IRDA is not set
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_WITH_ABC is not set
# CONFIG_ISL29003 is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_IWL3945 is not set
@@ -1160,6 +1178,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LOGO is not set
# CONFIG_LSF is not set
# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
# CONFIG_LXT_PHY is not set
CONFIG_MAC80211_DEFAULT_PS_VALUE=1
CONFIG_MAC80211_DEFAULT_PS=y
@@ -1936,6 +1955,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_MPT2SAS is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NETLINK is not set
# CONFIG_SCSI_NSP32 is not set
@@ -1986,6 +2006,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_ADT7475 is not set
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATK0110 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_CORETEMP is not set
# CONFIG_SENSORS_DME1737 is not set
@@ -2007,6 +2028,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_K8TEMP is not set
# CONFIG_SENSORS_LIS3_SPI is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
# CONFIG_SENSORS_LM63 is not set
# CONFIG_SENSORS_LM70 is not set
# CONFIG_SENSORS_LM75 is not set
@@ -2127,6 +2149,7 @@ CONFIG_SLAB=y
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_DEBUG is not set
@@ -2159,7 +2182,9 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
@@ -2170,6 +2195,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_MIPS is not set
@@ -2186,7 +2212,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_OPTI93X is not set
CONFIG_SND_OSSEMUL=y
# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCI is not set
+CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
# CONFIG_SND_PCM is not set
# CONFIG_SND_PCM_OSS is not set
@@ -2206,6 +2232,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
@@ -2232,6 +2259,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
# CONFIG_SOUND is not set
# CONFIG_SOUND_PRIME is not set
# CONFIG_SPARSEMEM_MANUAL is not set
diff --git a/target/linux/generic-2.6/config-2.6.33 b/target/linux/generic-2.6/config-2.6.33
index 82c3e32589..80fdf4c260 100644
--- a/target/linux/generic-2.6/config-2.6.33
+++ b/target/linux/generic-2.6/config-2.6.33
@@ -6,6 +6,7 @@
# CONFIG_AB4500_CORE is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACENIC is not set
+# CONFIG_ACPI_POWER_METER is not set
# CONFIG_ACORN_PARTITION is not set
# CONFIG_AD525X_DPOT is not set
# CONFIG_ADAPTEC_STARFIRE is not set
@@ -660,6 +661,7 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_GPIO_ADP5588 is not set
# CONFIG_GPIO_BT8XX is not set
@@ -756,6 +758,7 @@ CONFIG_HOTPLUG=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIA is not set
# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
CONFIG_HZ=100
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
@@ -1063,7 +1066,20 @@ CONFIG_IPW2200_MONITOR=y
# CONFIG_IRDA is not set
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_WITH_ABC is not set
# CONFIG_ISL29003 is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_IWL3945 is not set
@@ -1173,6 +1189,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LOGO is not set
# CONFIG_LSF is not set
# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
# CONFIG_LXT_PHY is not set
CONFIG_MAC80211_DEFAULT_PS_VALUE=1
CONFIG_MAC80211_DEFAULT_PS=y
@@ -1961,6 +1978,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_MPT2SAS is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NETLINK is not set
# CONFIG_SCSI_NSP32 is not set
@@ -2013,6 +2031,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_AMC6821 is not set
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATK0110 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_CORETEMP is not set
# CONFIG_SENSORS_DME1737 is not set
@@ -2033,6 +2052,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
# CONFIG_SENSORS_LIS3_I2C is not set
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LM63 is not set
@@ -2156,6 +2176,7 @@ CONFIG_SLAB=y
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_DEBUG is not set
@@ -2188,7 +2209,9 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
@@ -2199,6 +2222,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_MIPS is not set
@@ -2215,7 +2239,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_OPTI93X is not set
CONFIG_SND_OSSEMUL=y
# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCI is not set
+CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
# CONFIG_SND_PCM is not set
# CONFIG_SND_PCM_OSS is not set
@@ -2233,6 +2257,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIS7019 is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SOC is not set
# CONFIG_SND_SONICVIBES is not set
@@ -2260,6 +2285,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
# CONFIG_SOUND is not set
# CONFIG_SOUND_PRIME is not set
# CONFIG_SPARSEMEM_MANUAL is not set
diff --git a/target/linux/generic-2.6/config-2.6.34 b/target/linux/generic-2.6/config-2.6.34
index b985bc5f3f..03ed7879f4 100644
--- a/target/linux/generic-2.6/config-2.6.34
+++ b/target/linux/generic-2.6/config-2.6.34
@@ -6,6 +6,7 @@
# CONFIG_AB4500_CORE is not set
# CONFIG_ACCESSIBILITY is not set
# CONFIG_ACENIC is not set
+# CONFIG_ACPI_POWER_METER is not set
# CONFIG_ACORN_PARTITION is not set
# CONFIG_AD525X_DPOT is not set
# CONFIG_ADAPTEC_STARFIRE is not set
@@ -660,6 +661,7 @@ CONFIG_GENERIC_HARDIRQS=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_IRQ_PROBE=y
CONFIG_GENERIC_TIME=y
+# CONFIG_GIGASET_DEBUG is not set
# CONFIG_GFS2_FS is not set
# CONFIG_GPIO_ADP5588 is not set
# CONFIG_GPIO_BT8XX is not set
@@ -756,6 +758,7 @@ CONFIG_HOTPLUG=y
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
# CONFIG_HW_RANDOM_VIA is not set
# CONFIG_HYPERV is not set
+# CONFIG_HYSDN is not set
CONFIG_HZ=100
# CONFIG_HZ_1000 is not set
CONFIG_HZ_100=y
@@ -1063,7 +1066,20 @@ CONFIG_IPW2200_MONITOR=y
# CONFIG_IRDA is not set
# CONFIG_IRQSOFF_TRACER is not set
# CONFIG_ISCSI_TCP is not set
-# CONFIG_ISDN is not set
+CONFIG_ISDN=y
+# CONFIG_ISDN_AUDIO is not set
+# CONFIG_ISDN_CAPI_CAPIDRV is not set
+# CONFIG_ISDN_DIVERSION is not set
+# CONFIG_ISDN_DRV_ACT2000 is not set
+# CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
+# CONFIG_ISDN_DRV_EICON is not set
+# CONFIG_ISDN_DRV_HISAX is not set
+# CONFIG_ISDN_DRV_ICN is not set
+# CONFIG_ISDN_DRV_LOOP is not set
+# CONFIG_ISDN_DRV_PCBIT is not set
+# CONFIG_ISDN_DRV_SC is not set
+# CONFIG_ISDN_DRV_TPAM is not set
+# CONFIG_ISDN_WITH_ABC is not set
# CONFIG_ISL29003 is not set
# CONFIG_ISO9660_FS is not set
# CONFIG_IWL3945 is not set
@@ -1173,6 +1189,7 @@ CONFIG_LOG_BUF_SHIFT=14
# CONFIG_LOGO is not set
# CONFIG_LSF is not set
# CONFIG_LSI_ET1011C_PHY is not set
+# CONFIG_LTPC is not set
# CONFIG_LXT_PHY is not set
CONFIG_MAC80211_DEFAULT_PS_VALUE=1
CONFIG_MAC80211_DEFAULT_PS=y
@@ -1961,6 +1978,7 @@ CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_MPT2SAS is not set
CONFIG_SCSI_MULTI_LUN=y
# CONFIG_SCSI_MVSAS is not set
+# CONFIG_SCSI_MVSAS_DEBUG is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NETLINK is not set
# CONFIG_SCSI_NSP32 is not set
@@ -2013,6 +2031,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_AMC6821 is not set
# CONFIG_SENSORS_APPLESMC is not set
# CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATK0110 is not set
# CONFIG_SENSORS_ATXP1 is not set
# CONFIG_SENSORS_CORETEMP is not set
# CONFIG_SENSORS_DME1737 is not set
@@ -2033,6 +2052,7 @@ CONFIG_SELECT_MEMORY_MODEL=y
# CONFIG_SENSORS_I5K_AMB is not set
# CONFIG_SENSORS_IT87 is not set
# CONFIG_SENSORS_K8TEMP is not set
+# CONFIG_SENSORS_LIS3LV02D is not set
# CONFIG_SENSORS_LIS3_I2C is not set
# CONFIG_SENSORS_LIS3_SPI is not set
# CONFIG_SENSORS_LM63 is not set
@@ -2156,6 +2176,7 @@ CONFIG_SLAB=y
# CONFIG_SND_CS46XX is not set
# CONFIG_SND_CS5530 is not set
# CONFIG_SND_CS5535AUDIO is not set
+# CONFIG_SND_CTXFI is not set
# CONFIG_SND_DARLA20 is not set
# CONFIG_SND_DARLA24 is not set
# CONFIG_SND_DEBUG is not set
@@ -2188,7 +2209,9 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_ICE1712 is not set
# CONFIG_SND_ICE1724 is not set
# CONFIG_SND_INDIGODJ is not set
+# CONFIG_SND_INDIGODJX is not set
# CONFIG_SND_INDIGOIO is not set
+# CONFIG_SND_INDIGOIOX is not set
# CONFIG_SND_INDIGO is not set
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
@@ -2199,6 +2222,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_KORG1212 is not set
# CONFIG_SND_LAYLA20 is not set
# CONFIG_SND_LAYLA24 is not set
+# CONFIG_SND_LX6464ES is not set
# CONFIG_SND_MAESTRO3 is not set
# CONFIG_SND_MIA is not set
# CONFIG_SND_MIPS is not set
@@ -2215,7 +2239,7 @@ CONFIG_SND_DRIVERS=y
# CONFIG_SND_OPTI93X is not set
CONFIG_SND_OSSEMUL=y
# CONFIG_SND_OXYGEN is not set
-# CONFIG_SND_PCI is not set
+CONFIG_SND_PCI=y
# CONFIG_SND_PCMCIA is not set
# CONFIG_SND_PCM is not set
# CONFIG_SND_PCM_OSS is not set
@@ -2233,6 +2257,7 @@ CONFIG_SND_PCM_OSS_PLUGINS=y
# CONFIG_SND_SBAWE is not set
# CONFIG_SND_SEQUENCER is not set
# CONFIG_SND_SERIAL_U16550 is not set
+# CONFIG_SND_SIS7019 is not set
# CONFIG_SND_SGALAXY is not set
# CONFIG_SND_SOC is not set
# CONFIG_SND_SONICVIBES is not set
@@ -2260,6 +2285,7 @@ CONFIG_SND_VERBOSE_PROCFS=y
# CONFIG_SOFT_WATCHDOG is not set
# CONFIG_SOLARIS_X86_PARTITION is not set
# CONFIG_SONYPI is not set
+# CONFIG_SONY_LAPTOP is not set
# CONFIG_SOUND is not set
# CONFIG_SOUND_PRIME is not set
# CONFIG_SPARSEMEM_MANUAL is not set