summaryrefslogtreecommitdiff
path: root/target/linux/generic/patches-2.6.38
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:52:15 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2011-06-18 15:52:15 +0000
commit79a7343560186716f25673c4bf43f752b4fb9032 (patch)
treef32c2e463010c0eb9f1e80d632625c3b252360f6 /target/linux/generic/patches-2.6.38
parent75f9e0c615d2fe50259ac6bc96e2b849fc975ea7 (diff)
downloadmtk-20170518-79a7343560186716f25673c4bf43f752b4fb9032.zip
mtk-20170518-79a7343560186716f25673c4bf43f752b4fb9032.tar.gz
mtk-20170518-79a7343560186716f25673c4bf43f752b4fb9032.tar.bz2
kernel: update to kernel 2.6.38.8
SVN-Revision: 27218
Diffstat (limited to 'target/linux/generic/patches-2.6.38')
-rw-r--r--target/linux/generic/patches-2.6.38/021-ssb_commit_settings_export.patch2
-rw-r--r--target/linux/generic/patches-2.6.38/473-mtd_m25p80_add_w25q128.patch2
-rw-r--r--target/linux/generic/patches-2.6.38/474-mtd_concat_sync_fix.patch2
-rw-r--r--target/linux/generic/patches-2.6.38/822-usb_serial_option_add_more_devices.patch12
-rw-r--r--target/linux/generic/patches-2.6.38/950-vm_exports.patch6
5 files changed, 12 insertions, 12 deletions
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 a0086ec..657fdd6 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 f24c226..9114555 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 4e3426b..ff3759e 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 c7a2fbf..10a6432 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 15484df..7ccede5 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/<pid>/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;
}