X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Fgeneric-2.6%2Fconfig-2.6.26;h=3a4b07b6143eae551dda884865e8f3b6fa6926cc;hp=64e6c785c30d7191e07443adf097e8482ddd38b6;hb=062b866b2a92758e0031a5bda3151e78c92e2667;hpb=c96fdb8c6110359388ffdd6fce5ef2ddc63871d3

diff --git a/target/linux/generic-2.6/config-2.6.26 b/target/linux/generic-2.6/config-2.6.26
index 64e6c785c3..3a4b07b614 100644
--- a/target/linux/generic-2.6/config-2.6.26
+++ b/target/linux/generic-2.6/config-2.6.26
@@ -98,6 +98,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
 # CONFIG_BLK_DEV_GENERIC is not set
 # CONFIG_BLK_DEV_HD is not set
 # CONFIG_BLK_DEV_HD_IDE is not set
+# 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_IDECD is not set
@@ -386,6 +387,7 @@ CONFIG_GENERIC_HWEIGHT=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_GENERIC_TIME=y
 # CONFIG_GFS2_FS is not set
+CONFIG_GPIO_DEVICE=m
 # CONFIG_GROUP_SCHED is not set
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
@@ -752,6 +754,7 @@ CONFIG_MAC_PARTITION=y
 # CONFIG_MARKERS is not set
 # CONFIG_MARVELL_PHY is not set
 # CONFIG_MD is not set
+# CONFIG_MEDIA_TUNER_CUSTOMIZE is not set
 # CONFIG_MEGARAID_LEGACY is not set
 # CONFIG_MEGARAID_NEWGEN is not set
 # CONFIG_MEGARAID_SAS is not set
@@ -1368,11 +1371,12 @@ CONFIG_SIGNALFD=y
 # CONFIG_SK98LIN is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-CONFIG_SLAB=y
+# CONFIG_SLAB is not set
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
-# CONFIG_SLUB is not set
+CONFIG_SLUB=y
+# CONFIG_SLUB_DEBUG is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
 CONFIG_SND=m
@@ -1898,4 +1902,3 @@ CONFIG_ZLIB_DEFLATE=y
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZONE_DMA=y
 CONFIG_ZONE_DMA_FLAG=1
-# CONFIG_GPIO_DEVICE is not set