From 2c1ed14849046c5bb4e045494588fe18b8590a0e Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 18 Jun 2011 15:52:15 +0000 Subject: kernel: update to kernel 2.6.38.8 git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27218 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/at91/Makefile | 2 +- .../patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch | 6 +++--- target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch | 4 ++-- .../linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch | 4 ++-- .../patches-2.6.38/021-ssb_commit_settings_export.patch | 2 +- .../generic/patches-2.6.38/473-mtd_m25p80_add_w25q128.patch | 2 +- .../generic/patches-2.6.38/474-mtd_concat_sync_fix.patch | 2 +- .../822-usb_serial_option_add_more_devices.patch | 12 ++++++------ target/linux/generic/patches-2.6.38/950-vm_exports.patch | 6 +++--- target/linux/mpc85xx/Makefile | 2 +- target/linux/omap24xx/Makefile | 2 +- 11 files changed, 22 insertions(+), 22 deletions(-) (limited to 'target/linux') diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 33dfa9a43..497980145 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -14,7 +14,7 @@ FEATURES:=squashfs jffs2 targz CFLAGS:=-Os -pipe -march=armv5te -mtune=arm926ej-s -fno-caller-saves SUBTARGETS:=netus tqma9263 -LINUX_VERSION:=2.6.38.6 +LINUX_VERSION:=2.6.38.8 DEVICE_TYPE= include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch b/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch index 496b6c078..6b042b170 100644 --- a/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch +++ b/target/linux/brcm47xx/patches-2.6.38/022-USB-Add-ehci-ssb-driver.patch @@ -37,7 +37,7 @@ Signed-off-by: Hauke Mehrtens depends on USB --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1254,9 +1254,14 @@ MODULE_LICENSE ("GPL"); +@@ -1256,9 +1256,14 @@ MODULE_LICENSE ("GPL"); #define PLATFORM_DRIVER ehci_msm_driver #endif @@ -53,7 +53,7 @@ Signed-off-by: Hauke Mehrtens #error "missing bus glue for ehci-hcd" #endif -@@ -1316,10 +1321,20 @@ static int __init ehci_hcd_init(void) +@@ -1318,10 +1323,20 @@ static int __init ehci_hcd_init(void) if (retval < 0) goto clean4; #endif @@ -75,7 +75,7 @@ Signed-off-by: Hauke Mehrtens clean4: #endif #ifdef OF_PLATFORM_DRIVER -@@ -1350,6 +1365,9 @@ module_init(ehci_hcd_init); +@@ -1352,6 +1367,9 @@ module_init(ehci_hcd_init); static void __exit ehci_hcd_cleanup(void) { diff --git a/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch b/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch index cf7425de6..6bcc4c3fb 100644 --- a/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch +++ b/target/linux/brcm47xx/patches-2.6.38/023-usb_ehci_ohci.patch @@ -152,7 +152,7 @@ +#endif --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1322,17 +1322,21 @@ static int __init ehci_hcd_init(void) +@@ -1324,17 +1324,21 @@ static int __init ehci_hcd_init(void) goto clean4; #endif @@ -174,7 +174,7 @@ #ifdef XILINX_OF_PLATFORM_DRIVER of_unregister_platform_driver(&XILINX_OF_PLATFORM_DRIVER); clean4: -@@ -1365,9 +1369,11 @@ module_init(ehci_hcd_init); +@@ -1367,9 +1371,11 @@ module_init(ehci_hcd_init); static void __exit ehci_hcd_cleanup(void) { diff --git a/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch b/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch index d7c9b8cf8..71ca06d33 100644 --- a/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch +++ b/target/linux/brcm47xx/patches-2.6.38/830-tg3_add_pci_ids.patch @@ -23,7 +23,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100 {PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, PCI_DEVICE_ID_TIGON3_5752)}, --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h -@@ -2073,6 +2073,7 @@ +@@ -2075,6 +2075,7 @@ #define PCI_DEVICE_ID_NX2_57711E 0x1650 #define PCI_DEVICE_ID_TIGON3_5705 0x1653 #define PCI_DEVICE_ID_TIGON3_5705_2 0x1654 @@ -31,7 +31,7 @@ Date: Thu Dec 16 20:01:17 2010 +0100 #define PCI_DEVICE_ID_TIGON3_5721 0x1659 #define PCI_DEVICE_ID_TIGON3_5722 0x165a #define PCI_DEVICE_ID_TIGON3_5723 0x165b -@@ -2086,11 +2087,13 @@ +@@ -2088,11 +2089,13 @@ #define PCI_DEVICE_ID_TIGON3_5754M 0x1672 #define PCI_DEVICE_ID_TIGON3_5755M 0x1673 #define PCI_DEVICE_ID_TIGON3_5756 0x1674 diff --git a/target/linux/generic/patches-2.6.38/021-ssb_commit_settings_export.patch b/target/linux/generic/patches-2.6.38/021-ssb_commit_settings_export.patch index a0086ec9d..657fdd6b9 100644 --- a/target/linux/generic/patches-2.6.38/021-ssb_commit_settings_export.patch +++ b/target/linux/generic/patches-2.6.38/021-ssb_commit_settings_export.patch @@ -67,7 +67,7 @@ u32 base = 0; --- a/include/linux/ssb/ssb.h +++ b/include/linux/ssb/ssb.h -@@ -518,6 +518,7 @@ extern int ssb_bus_may_powerdown(struct +@@ -518,6 +518,7 @@ extern int ssb_bus_may_powerdown(struct * Otherwise static always-on powercontrol will be used. */ extern int ssb_bus_powerup(struct ssb_bus *bus, bool dynamic_pctl); diff --git a/target/linux/generic/patches-2.6.38/473-mtd_m25p80_add_w25q128.patch b/target/linux/generic/patches-2.6.38/473-mtd_m25p80_add_w25q128.patch index f24c22610..9114555e6 100644 --- a/target/linux/generic/patches-2.6.38/473-mtd_m25p80_add_w25q128.patch +++ b/target/linux/generic/patches-2.6.38/473-mtd_m25p80_add_w25q128.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c -@@ -726,6 +726,7 @@ static const struct spi_device_id m25p_i +@@ -746,6 +746,7 @@ static const struct spi_device_id m25p_i { "w25q32", INFO(0xef4016, 0, 64 * 1024, 64, SECT_4K) }, { "w25x64", INFO(0xef3017, 0, 64 * 1024, 128, SECT_4K) }, { "w25q64", INFO(0xef4017, 0, 64 * 1024, 128, SECT_4K) }, diff --git a/target/linux/generic/patches-2.6.38/474-mtd_concat_sync_fix.patch b/target/linux/generic/patches-2.6.38/474-mtd_concat_sync_fix.patch index 4e3426b7b..ff3759e22 100644 --- a/target/linux/generic/patches-2.6.38/474-mtd_concat_sync_fix.patch +++ b/target/linux/generic/patches-2.6.38/474-mtd_concat_sync_fix.patch @@ -1,6 +1,6 @@ --- a/drivers/mtd/mtdconcat.c +++ b/drivers/mtd/mtdconcat.c -@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info +@@ -619,7 +619,8 @@ static void concat_sync(struct mtd_info for (i = 0; i < concat->num_subdev; i++) { struct mtd_info *subdev = concat->subdev[i]; diff --git a/target/linux/generic/patches-2.6.38/822-usb_serial_option_add_more_devices.patch b/target/linux/generic/patches-2.6.38/822-usb_serial_option_add_more_devices.patch index c7a2fbf72..10a64326c 100644 --- a/target/linux/generic/patches-2.6.38/822-usb_serial_option_add_more_devices.patch +++ b/target/linux/generic/patches-2.6.38/822-usb_serial_option_add_more_devices.patch @@ -1,14 +1,14 @@ --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c -@@ -149,6 +149,7 @@ static void option_instat_callback(struc - #define HUAWEI_PRODUCT_K3765 0x1465 +@@ -150,6 +150,7 @@ static void option_instat_callback(struc #define HUAWEI_PRODUCT_E14AC 0x14AC #define HUAWEI_PRODUCT_ETS1220 0x1803 + #define HUAWEI_PRODUCT_E353 0x1506 +#define HUAWEI_PRODUCT_E173S 0x1C05 #define QUANTA_VENDOR_ID 0x0408 #define QUANTA_PRODUCT_Q101 0xEA02 -@@ -344,6 +345,7 @@ static void option_instat_callback(struc +@@ -345,6 +346,7 @@ static void option_instat_callback(struc /* ALCATEL PRODUCTS */ #define ALCATEL_VENDOR_ID 0x1bbb #define ALCATEL_PRODUCT_X060S 0x0000 @@ -16,15 +16,15 @@ #define PIRELLI_VENDOR_ID 0x1266 #define PIRELLI_PRODUCT_C100_1 0x1002 -@@ -528,6 +530,7 @@ static const struct usb_device_id option - { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_K3765, 0xff, 0xff, 0xff) }, +@@ -534,6 +536,7 @@ static const struct usb_device_id option { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_ETS1220, 0xff, 0xff, 0xff) }, { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E14AC, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E353, 0xff, 0x01, 0x01) }, + { USB_DEVICE(HUAWEI_VENDOR_ID, HUAWEI_PRODUCT_E173S) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V640) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V620) }, { USB_DEVICE(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_V740) }, -@@ -931,6 +934,7 @@ static const struct usb_device_id option +@@ -937,6 +940,7 @@ static const struct usb_device_id option { USB_DEVICE(ALINK_VENDOR_ID, 0x9000) }, { USB_DEVICE_AND_INTERFACE_INFO(ALINK_VENDOR_ID, ALINK_PRODUCT_3GU, 0xff, 0xff, 0xff) }, { USB_DEVICE(ALCATEL_VENDOR_ID, ALCATEL_PRODUCT_X060S) }, diff --git a/target/linux/generic/patches-2.6.38/950-vm_exports.patch b/target/linux/generic/patches-2.6.38/950-vm_exports.patch index 15484dfc3..7ccede586 100644 --- a/target/linux/generic/patches-2.6.38/950-vm_exports.patch +++ b/target/linux/generic/patches-2.6.38/950-vm_exports.patch @@ -1,6 +1,6 @@ --- a/mm/shmem.c +++ b/mm/shmem.c -@@ -2710,6 +2710,16 @@ out: +@@ -2730,6 +2730,16 @@ out: /* common code */ @@ -17,7 +17,7 @@ /** * shmem_file_setup - get an unlinked file living in tmpfs * @name: name for dentry (to be seen in /proc//maps -@@ -2787,10 +2797,7 @@ int shmem_zero_setup(struct vm_area_stru +@@ -2807,10 +2817,7 @@ int shmem_zero_setup(struct vm_area_stru if (IS_ERR(file)) return PTR_ERR(file); @@ -88,7 +88,7 @@ /** * zap_vma_ptes - remove ptes mapping the vma -@@ -2701,6 +2702,7 @@ int vmtruncate_range(struct inode *inode +@@ -2699,6 +2700,7 @@ int vmtruncate_range(struct inode *inode return 0; } diff --git a/target/linux/mpc85xx/Makefile b/target/linux/mpc85xx/Makefile index a83103d6a..354343886 100644 --- a/target/linux/mpc85xx/Makefile +++ b/target/linux/mpc85xx/Makefile @@ -13,7 +13,7 @@ CFLAGS:=-Os -pipe -fno-caller-saves -mcpu=8540 FEATURES:=spe_fpu ramdisk MAINTAINER:=Imre Kaloz -LINUX_VERSION:=2.6.38.6 +LINUX_VERSION:=2.6.38.8 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/omap24xx/Makefile b/target/linux/omap24xx/Makefile index 2488ea505..3387b32d9 100644 --- a/target/linux/omap24xx/Makefile +++ b/target/linux/omap24xx/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=TI OMAP-24xx MAINTAINER:=Michael Buesch FEATURES:=targz squashfs jffs2 usb usbgadget display gpio audio -LINUX_VERSION:=2.6.38.6 +LINUX_VERSION:=2.6.38.8 define Target/Description TI OMAP-24xx -- cgit v1.2.3