aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6/config-2.6.25
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2008-04-30 10:59:03 +0000
committerImre Kaloz <kaloz@openwrt.org>2008-04-30 10:59:03 +0000
commit36e4fc9831e2a6c34062255152df310fee571479 (patch)
tree47709338b488d08e41d33b12764a76852c5071d6 /target/linux/generic-2.6/config-2.6.25
parent719fd8c757f3501dd1e0d4771922de1e50be4fe4 (diff)
downloadupstream-36e4fc9831e2a6c34062255152df310fee571479.tar.gz
upstream-36e4fc9831e2a6c34062255152df310fee571479.tar.bz2
upstream-36e4fc9831e2a6c34062255152df310fee571479.zip
sync ixp4xx related patches with 2.6.24 and upgrade to 2.6.25
SVN-Revision: 10988
Diffstat (limited to 'target/linux/generic-2.6/config-2.6.25')
-rw-r--r--target/linux/generic-2.6/config-2.6.253
1 files changed, 3 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25
index 30e51b93cd..810b613c79 100644
--- a/target/linux/generic-2.6/config-2.6.25
+++ b/target/linux/generic-2.6/config-2.6.25
@@ -1210,6 +1210,7 @@ CONFIG_SCSI_DMA=y
CONFIG_SCSI_LOWLEVEL=y
# CONFIG_SCSI_LPFC is not set
CONFIG_SCSI_MULTI_LUN=y
+# CONFIG_SCSI_MVSAS is not set
# CONFIG_SCSI_NCR53C406A is not set
# CONFIG_SCSI_NETLINK is not set
# CONFIG_SCSI_NSP32 is not set
@@ -1542,6 +1543,7 @@ CONFIG_USB_ACM=m
# CONFIG_USB_AIPTEK is not set
CONFIG_USB_ALI_M5632=y
CONFIG_USB_AN2720=y
+# CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
# CONFIG_USB_APPLEDISPLAY is not set
# CONFIG_USB_APPLETOUCH is not set
CONFIG_USB_ARCH_HAS_EHCI=y
@@ -1607,6 +1609,7 @@ CONFIG_USB_NET_MCS7830=m
CONFIG_USB_NET_NET1080=m
CONFIG_USB_NET_PLUSB=m
CONFIG_USB_NET_RNDIS_HOST=m
+# CONFIG_USB_NET_RNDIS_WLAN is not set
CONFIG_USB_NET_ZAURUS=m
# CONFIG_USB_OHCI_BIG_ENDIAN is not set
# CONFIG_USB_OHCI_HCD is not set