diff options
| author | Gabor Juhos <juhosg@openwrt.org> | 2008-08-22 15:37:19 +0000 |
|---|---|---|
| committer | Gabor Juhos <juhosg@openwrt.org> | 2008-08-22 15:37:19 +0000 |
| commit | 184c6b06f2bb29b693084174908c7a0f1b46e3d2 (patch) | |
| tree | eb6e3d897cf739fd60e1728c475b35141a76b0a4 /target/linux/generic-2.6/patches-2.6.26 | |
| parent | be1a9ff41dfeed9e00f165e6a661e26ccaa5549c (diff) | |
| download | mtk-20170518-184c6b06f2bb29b693084174908c7a0f1b46e3d2.zip mtk-20170518-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.gz mtk-20170518-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.bz2 | |
update to 2.6.26.3 and 2.6.25.16
SVN-Revision: 12371
Diffstat (limited to 'target/linux/generic-2.6/patches-2.6.26')
4 files changed, 13 insertions, 15 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch index 48c7d52..07f569a 100644 --- a/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch +++ b/target/linux/generic-2.6/patches-2.6.26/071-redboot_boardconfig.patch @@ -1,7 +1,5 @@ -Index: linux-2.6.26.2/drivers/mtd/redboot.c -=================================================================== ---- linux-2.6.26.2.orig/drivers/mtd/redboot.c 2008-08-19 19:32:17.000000000 +0200 -+++ linux-2.6.26.2/drivers/mtd/redboot.c 2008-08-19 19:47:34.000000000 +0200 +--- a/drivers/mtd/redboot.c ++++ b/drivers/mtd/redboot.c @@ -13,6 +13,8 @@ #include <linux/mtd/mtd.h> #include <linux/mtd/partitions.h> @@ -19,7 +17,7 @@ Index: linux-2.6.26.2/drivers/mtd/redboot.c int nrparts = 0; struct fis_image_desc *buf; struct mtd_partition *parts; -@@ -217,14 +220,14 @@ +@@ -211,14 +214,14 @@ } } #endif @@ -36,7 +34,7 @@ Index: linux-2.6.26.2/drivers/mtd/redboot.c #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED if (nulllen > 0) { strcpy(nullname, nullstring); -@@ -243,6 +246,8 @@ +@@ -237,6 +240,8 @@ } #endif for ( ; i<nrparts; i++) { @@ -45,7 +43,7 @@ Index: linux-2.6.26.2/drivers/mtd/redboot.c parts[i].size = fl->img->size; parts[i].offset = fl->img->flash_base; parts[i].name = names; -@@ -276,6 +281,14 @@ +@@ -270,6 +275,14 @@ fl = fl->next; kfree(tmp_fl); } diff --git a/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch index 2339bd2..e812f9b 100644 --- a/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.26/208-rtl8110sb_fix.patch @@ -1,6 +1,6 @@ --- a/drivers/net/r8169.c +++ b/drivers/net/r8169.c -@@ -1537,7 +1537,7 @@ +@@ -1539,7 +1539,7 @@ .hw_start = rtl_hw_start_8169, .region = 1, .align = 0, @@ -9,7 +9,7 @@ RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .msi = 0 -@@ -1546,7 +1546,7 @@ +@@ -1548,7 +1548,7 @@ .hw_start = rtl_hw_start_8168, .region = 2, .align = 8, @@ -18,7 +18,7 @@ TxErr | TxOK | RxOK | RxErr, .napi_event = TxErr | TxOK | RxOK | RxOverflow, .msi = RTL_FEATURE_MSI -@@ -1555,7 +1555,7 @@ +@@ -1557,7 +1557,7 @@ .hw_start = rtl_hw_start_8101, .region = 2, .align = 8, @@ -27,7 +27,7 @@ RxFIFOOver | TxErr | TxOK | RxOK | RxErr, .napi_event = RxFIFOOver | TxErr | TxOK | RxOK | RxOverflow, .msi = RTL_FEATURE_MSI -@@ -2903,10 +2903,12 @@ +@@ -2905,10 +2905,12 @@ break; } diff --git a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch index f1bd446..e7bc6c5 100644 --- a/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.6/patches-2.6.26/801-usb_serial_endpoint_size.patch @@ -8,7 +8,7 @@ static int debug; static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; /* initially all NULL */ static DEFINE_MUTEX(table_lock); -@@ -815,7 +816,7 @@ +@@ -814,7 +815,7 @@ dev_err(&interface->dev, "No free urbs available\n"); goto probe_error; } @@ -17,7 +17,7 @@ port->bulk_in_size = buffer_size; port->bulk_in_endpointAddress = endpoint->bEndpointAddress; port->bulk_in_buffer = kmalloc (buffer_size, GFP_KERNEL); -@@ -1229,3 +1230,5 @@ +@@ -1228,3 +1229,5 @@ module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); diff --git a/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch b/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch index 682d2a1..a2d6436 100644 --- a/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch +++ b/target/linux/generic-2.6/patches-2.6.26/910-cryptodev_backport.patch @@ -6510,7 +6510,7 @@ + --- a/drivers/crypto/padlock-aes.c +++ b/drivers/crypto/padlock-aes.c -@@ -385,12 +385,12 @@ +@@ -411,12 +411,12 @@ int ret; if (!cpu_has_xcrypt) { @@ -6527,7 +6527,7 @@ --- a/drivers/crypto/padlock-sha.c +++ b/drivers/crypto/padlock-sha.c -@@ -254,12 +254,12 @@ +@@ -263,12 +263,12 @@ int rc = -ENODEV; if (!cpu_has_phe) { |