aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorMarkus Wigge <markus@cultcom.de>2009-02-09 08:48:14 +0000
committerMarkus Wigge <markus@cultcom.de>2009-02-09 08:48:14 +0000
commit2af3b23ec6c81ae8a763f279b5cca7d37644a5e7 (patch)
tree601af5e9e104c7ea010233df558be8a0a9674906 /target
parentc641deceb3ce0c8658f9836746c367692145be17 (diff)
downloadupstream-2af3b23ec6c81ae8a763f279b5cca7d37644a5e7.tar.gz
upstream-2af3b23ec6c81ae8a763f279b5cca7d37644a5e7.tar.bz2
upstream-2af3b23ec6c81ae8a763f279b5cca7d37644a5e7.zip
- added cs5535 ide driver
- change memory allocator to "SLUB" git-svn-id: svn://svn.openwrt.org/openwrt/trunk@14459 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/linux/x86/config-2.6.2813
1 files changed, 7 insertions, 6 deletions
diff --git a/target/linux/x86/config-2.6.28 b/target/linux/x86/config-2.6.28
index 1557ee17c9..b873b55e75 100644
--- a/target/linux/x86/config-2.6.28
+++ b/target/linux/x86/config-2.6.28
@@ -39,6 +39,7 @@ CONFIG_BINFMT_MISC=y
CONFIG_BITREVERSE=y
# CONFIG_BLK_DEV_4DRIVES is not set
# CONFIG_BLK_DEV_ALI14XX is not set
+CONFIG_BLK_DEV_CS5535=y
# CONFIG_BLK_DEV_DTC2278 is not set
CONFIG_BLK_DEV_GENERIC=y
# CONFIG_BLK_DEV_HT6560B is not set
@@ -178,7 +179,6 @@ CONFIG_HID_MICROSOFT=m
CONFIG_HID_MONTEREY=m
CONFIG_HID_PANTHERLORD=m
CONFIG_HID_PETALYNX=m
-# CONFIG_HID_PID is not set
CONFIG_HID_SAMSUNG=m
CONFIG_HID_SONY=m
CONFIG_HID_SUNPLUS=m
@@ -256,6 +256,7 @@ CONFIG_KEYBOARD_ATKBD=y
CONFIG_KMOD=y
CONFIG_KTIME_SCALAR=y
# CONFIG_LANCE is not set
+# CONFIG_LEDS_ALIX is not set
# CONFIG_LEDS_CLEVO_MAIL is not set
CONFIG_LEDS_NET48XX=m
# CONFIG_LEDS_WRAP is not set
@@ -438,6 +439,11 @@ CONFIG_SERIO_LIBPS2=y
# CONFIG_SERIO_PCIPS2 is not set
# CONFIG_SERIO_RAW is not set
CONFIG_SERIO_SERPORT=y
+# CONFIG_SLAB is not set
+CONFIG_SLUB=y
+CONFIG_SLUB_DEBUG=y
+# CONFIG_SLUB_DEBUG_ON is not set
+# CONFIG_SLUB_STATS is not set
CONFIG_SMP=y
# CONFIG_SMSC37B787_WDT is not set
CONFIG_SND_ISA=y
@@ -450,19 +456,16 @@ CONFIG_SPARSEMEM_STATIC=y
CONFIG_SSB_POSSIBLE=y
CONFIG_STOP_MACHINE=y
CONFIG_STRICT_DEVMEM=y
-# CONFIG_SUNRPC_REGISTER_V4 is not set
# CONFIG_SYSPROF_TRACER is not set
CONFIG_SYSVIPC_SYSCTL=y
# CONFIG_TCIC is not set
# CONFIG_TELCLOCK is not set
-# CONFIG_THRUSTMASTER_FF is not set
# CONFIG_TOSHIBA is not set
# CONFIG_TYPHOON is not set
CONFIG_UID16=y
CONFIG_USB=m
CONFIG_USB_EHCI_HCD=m
# CONFIG_USB_NET_DM9601 is not set
-# CONFIG_USB_NET_SMSC95XX is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set
# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set
CONFIG_USB_OHCI_HCD=m
@@ -485,7 +488,6 @@ CONFIG_VORTEX=m
CONFIG_VT=y
CONFIG_VT_CONSOLE=y
# CONFIG_VT_HW_CONSOLE_BINDING is not set
-# CONFIG_W1_SLAVE_BQ27000 is not set
# CONFIG_W83697UG_WDT is not set
# CONFIG_WAFER_WDT is not set
# CONFIG_WDT is not set
@@ -543,5 +545,4 @@ CONFIG_YENTA_O2=y
CONFIG_YENTA_RICOH=y
CONFIG_YENTA_TI=y
CONFIG_YENTA_TOSHIBA=y
-# CONFIG_ZEROPLUS_FF is not set
# CONFIG_ZONE_DMA32 is not set