From 36e4fc9831e2a6c34062255152df310fee571479 Mon Sep 17 00:00:00 2001 From: Imre Kaloz Date: Wed, 30 Apr 2008 10:59:03 +0000 Subject: sync ixp4xx related patches with 2.6.24 and upgrade to 2.6.25 SVN-Revision: 10988 --- target/linux/generic-2.6/config-2.6.25 | 3 +++ 1 file changed, 3 insertions(+) (limited to 'target/linux/generic-2.6/config-2.6.25') diff --git a/target/linux/generic-2.6/config-2.6.25 b/target/linux/generic-2.6/config-2.6.25 index 30e51b9..810b613 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 -- cgit v1.1