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.25 | |
| parent | be1a9ff41dfeed9e00f165e6a661e26ccaa5549c (diff) | |
| download | upstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.gz upstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.tar.bz2 upstream-184c6b06f2bb29b693084174908c7a0f1b46e3d2.zip | |
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.25')
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch | 8 | ||||
| -rw-r--r-- | target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch b/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch index 2339bd2625..e812f9b51e 100644 --- a/target/linux/generic-2.6/patches-2.6.25/208-rtl8110sb_fix.patch +++ b/target/linux/generic-2.6/patches-2.6.25/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.25/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch index 79ee43e16a..e91ff5eafa 100644 --- a/target/linux/generic-2.6/patches-2.6.25/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.6/patches-2.6.25/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); -@@ -904,7 +905,7 @@ +@@ -903,7 +904,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); -@@ -1316,3 +1317,5 @@ +@@ -1315,3 +1316,5 @@ module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); |