diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2008-04-30 10:59:03 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2008-04-30 10:59:03 +0000 |
| commit | 906fdf39167ec5703232638015a6d3ff5f3cdb49 (patch) | |
| tree | 34d8aa29337e3b594b9617baeaf2db84e77bb1e0 /target/linux/generic-2.6/config-2.6.25 | |
| parent | 9111be4e4659459bd2f30367563a90353ab3f822 (diff) | |
| download | upstream-906fdf39167ec5703232638015a6d3ff5f3cdb49.tar.gz upstream-906fdf39167ec5703232638015a6d3ff5f3cdb49.tar.bz2 upstream-906fdf39167ec5703232638015a6d3ff5f3cdb49.zip | |
sync ixp4xx related patches with 2.6.24 and upgrade to 2.6.25
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10988 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic-2.6/config-2.6.25')
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.25 | 3 |
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 |