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 | 36e4fc9831e2a6c34062255152df310fee571479 (patch) | |
| tree | 47709338b488d08e41d33b12764a76852c5071d6 /target/linux/generic-2.6 | |
| parent | 719fd8c757f3501dd1e0d4771922de1e50be4fe4 (diff) | |
| download | mtk-20170518-36e4fc9831e2a6c34062255152df310fee571479.zip mtk-20170518-36e4fc9831e2a6c34062255152df310fee571479.tar.gz mtk-20170518-36e4fc9831e2a6c34062255152df310fee571479.tar.bz2 | |
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')
| -rw-r--r-- | target/linux/generic-2.6/config-2.6.25 | 3 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch | 16 |
2 files changed, 19 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 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 diff --git a/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch b/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch new file mode 100644 index 0000000..3ed2908 --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.25/403-ds1672_detect.patch @@ -0,0 +1,16 @@ +--- linux-2.6.24.5/drivers/rtc/rtc-ds1672.c 2008-04-19 03:53:39.000000000 +0200 ++++ linux-2.6.24.5-owrt/drivers/rtc/rtc-ds1672.c 2008-04-29 22:16:41.000000000 +0200 +@@ -13,10 +13,10 @@ + #include <linux/i2c.h> + #include <linux/rtc.h> + +-#define DRV_VERSION "0.3" ++#define DRV_VERSION "0.4" + +-/* Addresses to scan: none. This chip cannot be detected. */ +-static const unsigned short normal_i2c[] = { I2C_CLIENT_END }; ++/* Addresses to scan: 0x68 */ ++static const unsigned short normal_i2c[] = { 0x68, I2C_CLIENT_END }; + + /* Insmod parameters */ + I2C_CLIENT_INSMOD; |