move some 2.6.27 config stuff from ixp to generic, use slab instead of slub by defaul...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12800 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/linux/generic-2.6/config-2.6.27 b/target/linux/generic-2.6/config-2.6.27
index b8ccbe3..960e4aa 100644 (file)
--- a/target/linux/generic-2.6/config-2.6.27
+++ b/target/linux/generic-2.6/config-2.6.27
@@ -233,6 +233,8 @@ CONFIG_CMDLINE=""
 # CONFIG_COMPAT_BRK is not set
 CONFIG_CONFIGFS_FS=y
 # CONFIG_CONNECTOR is not set
+# CONFIG_CONTEXT_SWITCH_TRACER is not set
+# CONFIG_CPU_DCACHE_DISABLE is not set
 # CONFIG_CRAMFS is not set
 CONFIG_CRC16=m
 CONFIG_CRC32=y
@@ -315,9 +317,6 @@ CONFIG_DEFAULT_TCP_CONG="vegas"
 CONFIG_DEFAULT_VEGAS=y
 # CONFIG_DEFAULT_WESTWOOD is not set
 CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
-# CONFIG_DEVFS_DEBUG is not set
-CONFIG_DEVFS_FS=y
-CONFIG_DEVFS_MOUNT=y
 # CONFIG_DEVKMEM is not set
 # CONFIG_DGRS is not set
 # CONFIG_DISCONTIGMEM_MANUAL is not set
@@ -332,7 +331,7 @@ CONFIG_DEVFS_MOUNT=y
 # CONFIG_DUMMY is not set
 # CONFIG_DVB is not set
 # CONFIG_DVB_CORE is not set
-CONFIG_E100=m
+# CONFIG_E100 is not set
 # CONFIG_E1000 is not set
 # CONFIG_E1000E is not set
 # CONFIG_ECONET is not set
@@ -399,6 +398,12 @@ CONFIG_GPIO_DEVICE=m
 # CONFIG_HAMACHI is not set
 CONFIG_HAMRADIO=y
 # CONFIG_HAPPYMEAL is not set
+# CONFIG_HDLC is not set
+# CONFIG_HDLC_CISCO is not set
+# CONFIG_HDLC_FR is not set
+# CONFIG_HDLC_PPP is not set
+# CONFIG_HDLC_RAW is not set
+# CONFIG_HDLC_RAW_ETH is not set
 # CONFIG_HEADERS_CHECK is not set
 CONFIG_HERMES=m
 CONFIG_HFSPLUS_FS=m
@@ -410,12 +415,12 @@ CONFIG_HFS_FS=m
 # CONFIG_HID_SUPPORT is not set
 CONFIG_HIGH_RES_TIMERS=y
 # CONFIG_HIPPI is not set
-CONFIG_HOSTAP=m
+# CONFIG_HOSTAP is not set
 # CONFIG_HOSTAP_CS is not set
-CONFIG_HOSTAP_FIRMWARE=y
-CONFIG_HOSTAP_FIRMWARE_NVRAM=y
-CONFIG_HOSTAP_PCI=m
-CONFIG_HOSTAP_PLX=m
+# CONFIG_HOSTAP_FIRMWARE is not set
+# CONFIG_HOSTAP_FIRMWARE_NVRAM is not set
+# CONFIG_HOSTAP_PCI is not set
+# CONFIG_HOSTAP_PLX is not set
 CONFIG_HOTPLUG=y
 # CONFIG_HOTPLUG_CPU is not set
 # CONFIG_HOTPLUG_PCI is not set
@@ -474,6 +479,10 @@ CONFIG_HZ_100=y
 # CONFIG_I2C_VOODOO3 is not set
 # CONFIG_I2O is not set
 # CONFIG_I82092 is not set
+# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
+# CONFIG_IBM_NEW_EMAC_RGMII is not set
+# CONFIG_IBM_NEW_EMAC_TAH is not set
+# CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_ICPLUS_PHY is not set
 # CONFIG_IDEDISK_MULTI_MODE is not set
 # CONFIG_IDEDMA_IVB is not set
@@ -555,22 +564,22 @@ CONFIG_IOSCHED_NOOP=y
 # CONFIG_IP1000 is not set
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MANGLE=m
+# CONFIG_IP6_NF_MANGLE is not set
 CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
+# CONFIG_IP6_NF_MATCH_EUI64 is not set
+# CONFIG_IP6_NF_MATCH_FRAG is not set
+# CONFIG_IP6_NF_MATCH_HL is not set
+# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
 CONFIG_IP6_NF_MATCH_LIMIT=m
 CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_OPTS=m
+# CONFIG_IP6_NF_MATCH_OPTS is not set
 CONFIG_IP6_NF_MATCH_OWNER=m
-CONFIG_IP6_NF_MATCH_RT=m
+# CONFIG_IP6_NF_MATCH_RT is not set
 CONFIG_IP6_NF_QUEUE=m
 CONFIG_IP6_NF_RAW=m
 CONFIG_IP6_NF_TARGET_HL=m
 CONFIG_IP6_NF_TARGET_IMQ=m
-CONFIG_IP6_NF_TARGET_LOG=m
+# CONFIG_IP6_NF_TARGET_LOG is not set
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_TARGET_ROUTE=m
 # CONFIG_IPC_NS is not set
@@ -580,9 +589,10 @@ CONFIG_IPV6=m
 # CONFIG_IPV6_MIP6 is not set
 # CONFIG_IPV6_MROUTE is not set
 # CONFIG_IPV6_MULTIPLE_TABLES is not set
+CONFIG_IPV6_NDISC_NODETYPE=y
 # CONFIG_IPV6_OPTIMISTIC_DAD is not set
 # CONFIG_IPV6_PRIVACY is not set
-CONFIG_IPV6_ROUTER_PREF=y
+# CONFIG_IPV6_ROUTER_PREF is not set
 # CONFIG_IPV6_ROUTE_INFO is not set
 CONFIG_IPV6_SIT=m
 # CONFIG_IPV6_TUNNEL is not set
@@ -605,7 +615,7 @@ CONFIG_IP_MULTICAST=y
 CONFIG_IP_MULTIPLE_TABLES=y
 CONFIG_IP_NF_AMANDA=m
 CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARPTABLES=m
+# CONFIG_IP_NF_ARPTABLES is not set
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_IP_NF_CONNTRACK=y
 # CONFIG_IP_NF_CONNTRACK_EVENTS is not set
@@ -618,15 +628,15 @@ CONFIG_IP_NF_H323=m
 CONFIG_IP_NF_IPTABLES=m
 CONFIG_IP_NF_IRC=m
 CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_MATCH_ADDRTYPE=m
+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
 CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
+# CONFIG_IP_NF_MATCH_ECN is not set
 CONFIG_IP_NF_MATCH_HASHLIMIT=m
 CONFIG_IP_NF_MATCH_IPP2P=m
 CONFIG_IP_NF_MATCH_OWNER=m
-CONFIG_IP_NF_MATCH_RECENT=m
+# CONFIG_IP_NF_MATCH_RECENT is not set
 CONFIG_IP_NF_MATCH_SET=m
-CONFIG_IP_NF_MATCH_TIME=m
+# CONFIG_IP_NF_MATCH_TIME is not set
 CONFIG_IP_NF_MATCH_TOS=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_NAT=y
@@ -643,7 +653,7 @@ CONFIG_IP_NF_NAT_TFTP=m
 CONFIG_IP_NF_PPTP=m
 CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SET=m
+# CONFIG_IP_NF_SET is not set
 CONFIG_IP_NF_SET_HASHSIZE=1024
 CONFIG_IP_NF_SET_IPHASH=m
 CONFIG_IP_NF_SET_IPMAP=m
@@ -656,19 +666,19 @@ CONFIG_IP_NF_SET_NETHASH=m
 CONFIG_IP_NF_SET_PORTMAP=m
 CONFIG_IP_NF_SIP=m
 # CONFIG_IP_NF_TARGET_CLUSTERIP is not set
-CONFIG_IP_NF_TARGET_ECN=m
+# CONFIG_IP_NF_TARGET_ECN is not set
 CONFIG_IP_NF_TARGET_IMQ=m
-CONFIG_IP_NF_TARGET_LOG=m
+# CONFIG_IP_NF_TARGET_LOG is not set
 CONFIG_IP_NF_TARGET_MASQUERADE=m
-CONFIG_IP_NF_TARGET_NETMAP=m
+# CONFIG_IP_NF_TARGET_NETMAP is not set
 CONFIG_IP_NF_TARGET_REDIRECT=m
 CONFIG_IP_NF_TARGET_REJECT=m
 CONFIG_IP_NF_TARGET_ROUTE=m
 CONFIG_IP_NF_TARGET_SAME=m
 CONFIG_IP_NF_TARGET_SET=m
 CONFIG_IP_NF_TARGET_TOS=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_TARGET_ULOG=m
+# CONFIG_IP_NF_TARGET_TTL is not set
+# CONFIG_IP_NF_TARGET_ULOG is not set
 CONFIG_IP_NF_TFTP=m
 # CONFIG_IP_PNP is not set
 CONFIG_IP_ROUTE_FWMARK=y
@@ -682,6 +692,7 @@ CONFIG_IP_ROUTE_VERBOSE=y
 # CONFIG_IP_SCTP is not set
 # CONFIG_IP_VS is not set
 # CONFIG_IRDA is not set
+# CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_ISCSI_TCP is not set
 CONFIG_ISDN=m
 CONFIG_ISDN_CAPI=m
@@ -692,6 +703,7 @@ CONFIG_ISDN_CAPI_MIDDLEWARE=y
 # CONFIG_ISDN_DRV_AVMB1_VERBOSE_REASON is not set
 # CONFIG_ISDN_I4L is not set
 CONFIG_ISO9660_FS=m
+# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_IXGB is not set
 CONFIG_JBD=m
 # CONFIG_JBD_DEBUG is not set
@@ -723,8 +735,11 @@ CONFIG_JOLIET=y
 # CONFIG_KEXEC is not set
 # CONFIG_KEYS is not set
 # CONFIG_KMOD is not set
+# CONFIG_KPROBES is not set
+# CONFIG_LANMEDIA is not set
 # CONFIG_LAPB is not set
 # CONFIG_LASAT is not set
+# CONFIG_LATENCYTOP is not set
 # CONFIG_LBD is not set
 # CONFIG_LDM_PARTITION is not set
 CONFIG_LEDS_CLASS=y
@@ -792,6 +807,10 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 # CONFIG_MTD_AR7_PARTS is not set
 # CONFIG_MTD_DATAFLASH is not set
+# CONFIG_MTD_DEBUG is not set
+# CONFIG_MTD_DOC2000 is not set
+# CONFIG_MTD_DOC2001 is not set
+# CONFIG_MTD_DOC2001PLUS is not set
 # CONFIG_MTD_INTEL_VR_NOR is not set
 # CONFIG_MTD_M25P80 is not set
 # CONFIG_MTD_NAND is not set
@@ -805,6 +824,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
 # CONFIG_MYRI10GE is not set
 # CONFIG_NAMESPACES is not set
 # CONFIG_NCP_FS is not set
+# CONFIG_NE2K_PCI is not set
 CONFIG_NET=y
 # CONFIG_NETCONSOLE is not set
 # CONFIG_NETDEBUG is not set
@@ -892,7 +912,7 @@ CONFIG_NET_CLS_RSVP=m
 CONFIG_NET_CLS_RSVP6=m
 CONFIG_NET_CLS_TCINDEX=m
 CONFIG_NET_CLS_U32=m
-CONFIG_NET_EMATCH=y
+# CONFIG_NET_EMATCH is not set
 CONFIG_NET_EMATCH_CMP=m
 CONFIG_NET_EMATCH_META=m
 CONFIG_NET_EMATCH_NBYTE=m
@@ -904,7 +924,7 @@ CONFIG_NET_ETHERNET=y
 # CONFIG_NET_FC is not set
 CONFIG_NET_IPGRE=m
 CONFIG_NET_IPGRE_BROADCAST=y
-CONFIG_NET_IPIP=m
+# CONFIG_NET_IPIP is not set
 # CONFIG_NET_ISA is not set
 CONFIG_NET_KEY=m
 # CONFIG_NET_KEY_MIGRATE is not set
@@ -928,7 +948,7 @@ CONFIG_NET_SCH_GRED=m
 CONFIG_NET_SCH_HFSC=m
 CONFIG_NET_SCH_HTB=m
 CONFIG_NET_SCH_INGRESS=m
-CONFIG_NET_SCH_NETEM=m
+# CONFIG_NET_SCH_NETEM is not set
 CONFIG_NET_SCH_PRIO=m
 CONFIG_NET_SCH_RED=m
 CONFIG_NET_SCH_RR=m
@@ -936,6 +956,7 @@ CONFIG_NET_SCH_SFQ=m
 CONFIG_NET_SCH_TBF=m
 CONFIG_NET_SCH_TEQL=m
 # CONFIG_NET_TULIP is not set
+# CONFIG_NET_VENDOR_3COM is not set
 CONFIG_NET_WIRELESS=y
 CONFIG_NET_WIRELESS_RTNETLINK=y
 # CONFIG_NEW_GPIO is not set
@@ -1042,9 +1063,11 @@ CONFIG_NORTEL_HERMES=m
 # CONFIG_OCF_HIFN is not set
 # CONFIG_OCF_HIFNHIPP is not set
 # CONFIG_OCF_IXP4XX is not set
+# CONFIG_OCF_OCF is not set
 # CONFIG_OCF_OCFNULL is not set
 # CONFIG_OCF_SAFE is not set
 # CONFIG_OCF_TALITOS is not set
+# CONFIG_OMFS_FS is not set
 # CONFIG_OSF_PARTITION is not set
 CONFIG_PACKET=y
 CONFIG_PACKET_MMAP=y
@@ -1099,6 +1122,8 @@ CONFIG_PATA_PLATFORM=m
 # CONFIG_PCCARD is not set
 # CONFIG_PCF8575 is not set
 # CONFIG_PCI is not set
+# CONFIG_PCI200SYN is not set
+# CONFIG_PCIPCWATCHDOG is not set
 # CONFIG_PCI_ATMEL is not set
 CONFIG_PCI_HERMES=m
 # CONFIG_PCI_LEGACY is not set
@@ -1148,7 +1173,7 @@ CONFIG_PREEMPT_NONE=y
 CONFIG_PREVENT_FIRMWARE_BUILD=y
 CONFIG_PRINTK=y
 # CONFIG_PRINTK_TIME is not set
-CONFIG_PRISM54=m
+# CONFIG_PRISM54 is not set
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 # CONFIG_PROC_PAGE_MONITOR is not set
@@ -1178,6 +1203,10 @@ CONFIG_PROC_SYSCTL=y
 # CONFIG_RAID_ATTRS is not set
 CONFIG_RAMFS=y
 # CONFIG_RAW_DRIVER is not set
+# CONFIG_REGULATOR is not set
+# CONFIG_REGULATOR_BQ24022 is not set
+# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
+# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REISERFS_CHECK is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_REISERFS_FS_XATTR is not set
@@ -1220,6 +1249,7 @@ CONFIG_RT_MUTEXES=y
 # CONFIG_SATA_VIA is not set
 # CONFIG_SATA_VITESSE is not set
 # CONFIG_SC92031 is not set
+# CONFIG_SCHED_TRACER is not set
 CONFIG_SCSI=m
 # CONFIG_SCSI_3W_9XXX is not set
 # CONFIG_SCSI_7000FASST is not set
@@ -1380,14 +1410,15 @@ CONFIG_SIGNALFD=y
 # CONFIG_SK98LIN is not set
 # CONFIG_SKGE is not set
 # CONFIG_SKY2 is not set
-# CONFIG_SLAB is not set
+CONFIG_SLAB=y
 CONFIG_SLHC=m
 # CONFIG_SLIP is not set
 # CONFIG_SLOB is not set
-CONFIG_SLUB=y
+# CONFIG_SLUB is not set
 # CONFIG_SLUB_DEBUG is not set
 # CONFIG_SMB_FS is not set
 # CONFIG_SMB_NLS_DEFAULT is not set
+# CONFIG_SMC91X is not set
 CONFIG_SND=m
 # CONFIG_SND_AC97_POWER_SAVE is not set
 # CONFIG_SND_AD1816A is not set
@@ -1471,6 +1502,7 @@ CONFIG_SND_MIXER_OSS=m
 # CONFIG_SND_OPTI93X is not set
 CONFIG_SND_OSSEMUL=y
 # CONFIG_SND_OXYGEN is not set
+# CONFIG_SND_PCI is not set
 CONFIG_SND_PCM=m
 CONFIG_SND_PCM_OSS=m
 CONFIG_SND_PCM_OSS_PLUGINS=y
@@ -1733,7 +1765,7 @@ CONFIG_USB_SERIAL_KOBIL_SCT=m
 CONFIG_USB_SERIAL_MCT_U232=m
 CONFIG_USB_SERIAL_MOS7720=m
 CONFIG_USB_SERIAL_MOS7840=m
-CONFIG_USB_SERIAL_MOTOROLA=m
+# CONFIG_USB_SERIAL_MOTOROLA is not set
 CONFIG_USB_SERIAL_NAVMAN=m
 CONFIG_USB_SERIAL_OMNINET=m
 CONFIG_USB_SERIAL_OPTION=m
@@ -1742,7 +1774,7 @@ CONFIG_USB_SERIAL_PL2303=m
 CONFIG_USB_SERIAL_SAFE=m
 CONFIG_USB_SERIAL_SAFE_PADDED=y
 CONFIG_USB_SERIAL_SIERRAWIRELESS=m
-CONFIG_USB_SERIAL_SPCP8X5=m
+# CONFIG_USB_SERIAL_SPCP8X5 is not set
 CONFIG_USB_SERIAL_TI=m
 CONFIG_USB_SERIAL_VISOR=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
@@ -1765,6 +1797,7 @@ CONFIG_USB_STORAGE_KARMA=y
 # CONFIG_USB_STORAGE_ONETOUCH is not set
 CONFIG_USB_STORAGE_SDDR09=y
 CONFIG_USB_STORAGE_SDDR55=y
+# CONFIG_USB_STORAGE_SIERRA is not set
 CONFIG_USB_STORAGE_USBAT=y
 # CONFIG_USB_STV680 is not set
 # CONFIG_USB_SUPPORT is not set
@@ -1814,6 +1847,7 @@ CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_IVTV is not set
 # CONFIG_VIDEO_KS0127 is not set
 # CONFIG_VIDEO_M52790 is not set
+# CONFIG_VIDEO_MEDIA is not set
 # CONFIG_VIDEO_MSP3400 is not set
 # CONFIG_VIDEO_MXB is not set
 # CONFIG_VIDEO_OUTPUT_CONTROL is not set
@@ -1847,7 +1881,8 @@ CONFIG_VIDEO_DEV=m
 # CONFIG_VIDEO_USBVISION is not set
 # CONFIG_VIDEO_V4L1 is not set
 CONFIG_VIDEO_V4L1_COMPAT=y
-CONFIG_VIDEO_V4L2=y
+# CONFIG_VIDEO_V4L2 is not set
+# CONFIG_VIDEO_V4L2_COMMON is not set
 # CONFIG_VIDEO_VIVI is not set
 # CONFIG_VIDEO_VP27SMPX is not set
 # CONFIG_VIDEO_VPX3220 is not set
@@ -1876,11 +1911,13 @@ CONFIG_W1=m
 # CONFIG_W83877F_WDT is not set
 # CONFIG_W83977F_WDT is not set
 # CONFIG_WAN is not set
+# CONFIG_WANXL is not set
 # CONFIG_WAN_ROUTER is not set
 CONFIG_WATCHDOG=y
 # CONFIG_WATCHDOG_NOWAYOUT is not set
 # CONFIG_WDTPCI is not set
 CONFIG_WIRELESS_EXT=y
+CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_WLAN_80211=y
 # CONFIG_WLAN_PRE80211 is not set
 # CONFIG_WR_PPMC is not set
@@ -1891,11 +1928,12 @@ CONFIG_XFRM=y
 # CONFIG_XFRM_SUB_POLICY is not set
 CONFIG_XFRM_USER=m
 # CONFIG_XFS_DEBUG is not set
-CONFIG_XFS_FS=m
+# CONFIG_XFS_FS is not set
 # CONFIG_XFS_POSIX_ACL is not set
 # CONFIG_XFS_QUOTA is not set
 # CONFIG_XFS_RT is not set
 # CONFIG_XFS_SECURITY is not set
+# CONFIG_XIP_KERNEL is not set
 # CONFIG_YAFFS_FS is not set
 # CONFIG_YAM is not set
 # CONFIG_YELLOWFIN is not set

diff --git a/target/linux/ixp4xx/config-2.6.27 b/target/linux/ixp4xx/config-2.6.27
index 80f71e6..f0f2937 100644 (file)
--- a/target/linux/ixp4xx/config-2.6.27
+++ b/target/linux/ixp4xx/config-2.6.27
@@ -75,7 +75,6 @@ CONFIG_BOUNCE=y
 CONFIG_CLASSIC_RCU=y
 CONFIG_CMDLINE="root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200 init=/etc/preinit"
 # CONFIG_CONFIGFS_FS is not set
-# CONFIG_CONTEXT_SWITCH_TRACER is not set
 CONFIG_CPU_32=y
 CONFIG_CPU_32v5=y
 CONFIG_CPU_ABRT_EV5T=y
@@ -83,7 +82,6 @@ CONFIG_CPU_BIG_ENDIAN=y
 CONFIG_CPU_CACHE_VIVT=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
-# CONFIG_CPU_DCACHE_DISABLE is not set
 CONFIG_CPU_IXP43X=y
 CONFIG_CPU_IXP46X=y
 CONFIG_CPU_PABRT_NOIFAR=y
@@ -106,7 +104,6 @@ CONFIG_DMABOUNCE_DEBUG=y
 # CONFIG_DMADEVICES is not set
 CONFIG_DNOTIFY=y
 # CONFIG_DSCC4 is not set
-# CONFIG_E100 is not set
 CONFIG_EXTRA_FIRMWARE=""
 # CONFIG_FARSYNC is not set
 CONFIG_FIRMWARE_IN_KERNEL=y
@@ -141,12 +138,6 @@ CONFIG_HAVE_KPROBES=y
 CONFIG_HAVE_KRETPROBES=y
 CONFIG_HAVE_LATENCYTOP_SUPPORT=y
 CONFIG_HAVE_OPROFILE=y
-CONFIG_HDLC=m
-CONFIG_HDLC_CISCO=m
-CONFIG_HDLC_FR=m
-CONFIG_HDLC_PPP=m
-CONFIG_HDLC_RAW=m
-# CONFIG_HDLC_RAW_ETH is not set
 # CONFIG_HERMES is not set
 CONFIG_HID=m
 CONFIG_HID_SUPPORT=y
@@ -163,41 +154,13 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
 # CONFIG_I2C_IOP3XX is not set
 # CONFIG_I2C_ISCH is not set
-# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
-# CONFIG_IBM_NEW_EMAC_RGMII is not set
-# CONFIG_IBM_NEW_EMAC_TAH is not set
-# CONFIG_IBM_NEW_EMAC_ZMII is not set
 # CONFIG_IDE is not set
 CONFIG_INITRAMFS_SOURCE=""
 CONFIG_INPUT=m
-# CONFIG_IP6_NF_MANGLE is not set
-# CONFIG_IP6_NF_MATCH_EUI64 is not set
-# CONFIG_IP6_NF_MATCH_FRAG is not set
-# CONFIG_IP6_NF_MATCH_HL is not set
-# CONFIG_IP6_NF_MATCH_IPV6HEADER is not set
-# CONFIG_IP6_NF_MATCH_OPTS is not set
-# CONFIG_IP6_NF_MATCH_RT is not set
-# CONFIG_IP6_NF_TARGET_LOG is not set
-CONFIG_IPV6_NDISC_NODETYPE=y
-# CONFIG_IPV6_ROUTER_PREF is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_MROUTE=y
-# CONFIG_IP_NF_ARPTABLES is not set
-# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
-# CONFIG_IP_NF_MATCH_ECN is not set
-# CONFIG_IP_NF_MATCH_RECENT is not set
-# CONFIG_IP_NF_MATCH_TIME is not set
-# CONFIG_IP_NF_SET is not set
-# CONFIG_IP_NF_TARGET_ECN is not set
-# CONFIG_IP_NF_TARGET_LOG is not set
-# CONFIG_IP_NF_TARGET_NETMAP is not set
-# CONFIG_IP_NF_TARGET_TTL is not set
-# CONFIG_IP_NF_TARGET_ULOG is not set
 CONFIG_IP_PIMSM_V1=y
 CONFIG_IP_PIMSM_V2=y
-# CONFIG_IRQSOFF_TRACER is not set
 # CONFIG_ISDN is not set
-# CONFIG_IWLWIFI_LEDS is not set
 # CONFIG_IWMMXT is not set
 CONFIG_IXP4XX_ETH=y
 # CONFIG_IXP4XX_HSS is not set
@@ -205,9 +168,8 @@ CONFIG_IXP4XX_ETH=y
 CONFIG_IXP4XX_NPE=y
 CONFIG_IXP4XX_QMGR=y
 CONFIG_IXP4XX_WATCHDOG=y
+CONFIG_KALLSYMS=y
 CONFIG_KMOD=y
-# CONFIG_LANMEDIA is not set
-# CONFIG_LATENCYTOP is not set
 # CONFIG_LEDS_ALIX is not set
 CONFIG_LEDS_FSG=y
 CONFIG_LEDS_GPIO=y
@@ -278,10 +240,6 @@ CONFIG_MTD_CHAR=y
 # CONFIG_MTD_CMDLINE_PARTS is not set
 CONFIG_MTD_COMPLEX_MAPPINGS=y
 # CONFIG_MTD_CONCAT is not set
-# CONFIG_MTD_DEBUG is not set
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
 CONFIG_MTD_GEN_PROBE=y
 CONFIG_MTD_IXP4XX=y
 # CONFIG_MTD_JEDECPROBE is not set
@@ -307,13 +265,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_MTD_ROM is not set
 # CONFIG_MTD_SLRAM is not set
 # CONFIG_NATSEMI is not set
-# CONFIG_NE2K_PCI is not set
-# CONFIG_NET_CLS_ACT is not set
-# CONFIG_NET_CLS_IND is not set
-# CONFIG_NET_EMATCH is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_SCH_NETEM is not set
-# CONFIG_NET_VENDOR_3COM is not set
 # CONFIG_NLS_CODEPAGE_437 is not set
 # CONFIG_NLS_CODEPAGE_850 is not set
 # CONFIG_NLS_ISO8859_1 is not set
@@ -321,8 +272,6 @@ CONFIG_MTD_REDBOOT_PARTS_READONLY=y
 # CONFIG_NLS_KOI8_R is not set
 # CONFIG_NO_IOPORT is not set
 # CONFIG_NVRAM is not set
-# CONFIG_OCF_OCF is not set
-# CONFIG_OMFS_FS is not set
 # CONFIG_OUTER_CACHE is not set
 CONFIG_PAGEFLAGS_EXTENDED=y
 CONFIG_PATA_ARTOP=m
@@ -330,15 +279,8 @@ CONFIG_PATA_IXP4XX_CF=m
 # CONFIG_PATA_SCH is not set
 # CONFIG_PC300 is not set
 CONFIG_PCI=y
-# CONFIG_PCI200SYN is not set
-# CONFIG_PCIPCWATCHDOG is not set
 CONFIG_PCI_SYSCALL=y
-# CONFIG_PRISM54 is not set
 # CONFIG_R6040 is not set
-# CONFIG_REGULATOR is not set
-# CONFIG_REGULATOR_BQ24022 is not set
-# CONFIG_REGULATOR_FIXED_VOLTAGE is not set
-# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 CONFIG_RFKILL_LEDS=y
 CONFIG_RTC_CLASS=y
 # CONFIG_RTC_DEBUG is not set
@@ -366,7 +308,6 @@ CONFIG_RTC_INTF_PROC=y
 CONFIG_RTC_INTF_SYSFS=y
 CONFIG_RTC_LIB=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
-# CONFIG_SCHED_TRACER is not set
 # CONFIG_SCSI_DH is not set
 # CONFIG_SCSI_MULTI_LUN is not set
 CONFIG_SCSI_WAIT_SCAN=m
@@ -380,10 +321,11 @@ CONFIG_SENSORS_W83781D=y
 CONFIG_SERIAL_8250_NR_UARTS=4
 CONFIG_SERIAL_8250_RUNTIME_UARTS=4
 # CONFIG_SHMEM is not set
-# CONFIG_SMC91X is not set
+CONFIG_SLAB=y
+CONFIG_SLABINFO=y
+# CONFIG_SLUB is not set
 # CONFIG_SND_ARM is not set
 CONFIG_SND_DRIVERS=y
-# CONFIG_SND_PCI is not set
 CONFIG_SND_USB=y
 # CONFIG_SOFT_WATCHDOG is not set
 # CONFIG_SPARSEMEM_STATIC is not set
@@ -412,9 +354,6 @@ CONFIG_USB_EHCI_TT_NEWSCHED=y
 # CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
 # CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
 CONFIG_USB_OHCI_HCD=m
-# CONFIG_USB_SERIAL_MOTOROLA is not set
-# CONFIG_USB_SERIAL_SPCP8X5 is not set
-# CONFIG_USB_STORAGE_SIERRA is not set
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_UHCI_HCD=m
 # CONFIG_USE_GENERIC_SMP_HELPERS is not set
@@ -422,17 +361,9 @@ CONFIG_VECTORS_BASE=0xffff0000
 # CONFIG_VGASTATE is not set
 # CONFIG_VIA_RHINE is not set
 CONFIG_VIA_VELOCITY=m
-CONFIG_VIDEO_MEDIA=m
-CONFIG_VIDEO_V4L2=m
-CONFIG_VIDEO_V4L2_COMMON=m
 # CONFIG_VLAN_8021Q_GVRP is not set
 CONFIG_VM_EVENT_COUNTERS=y
-CONFIG_WAN=y
-# CONFIG_WANXL is not set
-CONFIG_WIRELESS_EXT_SYSFS=y
 CONFIG_XFRM_IPCOMP=m
-# CONFIG_XFS_FS is not set
-# CONFIG_XIP_KERNEL is not set
 CONFIG_XSCALE_PMU=y
 CONFIG_ZBOOT_ROM_BSS=0x0
 CONFIG_ZBOOT_ROM_TEXT=0x0