generic-2.6: sync patches to 2.6.33.1

[openwrt.git] / target / linux / generic-2.6 / config-2.6.30

diff --git a/target/linux/generic-2.6/config-2.6.30 b/target/linux/generic-2.6/config-2.6.30
index 61ba5f3..0379ce2 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.30
+++ b/target/linux/generic-2.6/config-2.6.30
@@ -513,6 +513,7 @@ CONFIG_EXPERIMENTAL=y
 # CONFIG_EXT3_FS_XATTR is not set
 # CONFIG_EXT4DEV_FS is not set
 # CONFIG_EXT4_FS is not set
+# CONFIG_EXT4DEV_COMPAT is not set
 CONFIG_EXTRA_FIRMWARE=""
 CONFIG_EXTRA_TARGETS=""
 # CONFIG_FAIR_GROUP_SCHED is not set
@@ -1047,7 +1048,7 @@ CONFIG_KMOD=y
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
 # CONFIG_LATENCYTOP is not set
-# CONFIG_LBD is not set
+CONFIG_LBD=y
 # CONFIG_LCD_LTV350QV is not set
 # CONFIG_LCD_TDO24M is not set
 # CONFIG_LCD_VGG2432A4 is not set
@@ -1442,11 +1443,11 @@ CONFIG_NFSD_TCP=y
 # CONFIG_NFSD_V2_ACL is not set
 # CONFIG_NFSD_V3_ACL is not set
 CONFIG_NFSD_V3=y
-CONFIG_NFSD_V4=y
+# CONFIG_NFSD_V4 is not set
 # CONFIG_NFS_FS is not set
 # CONFIG_NFS_V3_ACL is not set
 CONFIG_NFS_V3=y
-CONFIG_NFS_V4=y
+# CONFIG_NFS_V4 is not set
 # CONFIG_NFTL is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NL80211=y
@@ -1574,6 +1575,7 @@ CONFIG_PARTITION_ADVANCED=y
 # CONFIG_PC300TOO is not set
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set
+# CONFIG_PCI is not set
 # CONFIG_PCI200SYN is not set
 # CONFIG_PCI_ATMEL is not set
 # CONFIG_PCI_DEBUG is not set
@@ -1587,7 +1589,6 @@ CONFIG_PARTITION_ADVANCED=y
 CONFIG_PCI_QUIRKS=y
 # CONFIG_PCI_STUB is not set
 CONFIG_PCI_SYSCALL=y
-CONFIG_PCI=y
 # CONFIG_PCMCIA_AHA152X is not set
 # CONFIG_PCMCIA_ATMEL is not set
 # CONFIG_PCMCIA_DEBUG is not set
@@ -1751,6 +1752,7 @@ CONFIG_RTC_LIB=y
 # CONFIG_RTL8366_SMI is not set
 # CONFIG_RTL8366S_PHY_DEBUG_FS is not set
 # CONFIG_RTL8366S_PHY is not set
+# CONFIG_RTL8366RB_PHY is not set
 CONFIG_RT_MUTEXES=y
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_RUNTIME_DEBUG is not set