aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2008-10-05 06:26:28 +0000
committerGabor Juhos <juhosg@openwrt.org>2008-10-05 06:26:28 +0000
commit12701b1d25861c613347a62f0725e900086cd9ee (patch)
treecd11b430929c09817b59c85b1274912386ebfafd /target/linux/generic-2.6
parentfd03974e369bf3cf85eb5423bf4c1d6a02b4a387 (diff)
downloadupstream-12701b1d25861c613347a62f0725e900086cd9ee.tar.gz
upstream-12701b1d25861c613347a62f0725e900086cd9ee.tar.bz2
upstream-12701b1d25861c613347a62f0725e900086cd9ee.zip
refresh 2.6.27 patches based on -rc8
SVN-Revision: 12858
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch2
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch4
-rw-r--r--target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch2
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
index 142d3c0b2c..7f64e37ca9 100644
--- a/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/150-netfilter_imq.patch
@@ -687,7 +687,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/stat.h>
-@@ -1623,7 +1626,11 @@
+@@ -1624,7 +1627,11 @@
struct netdev_queue *txq)
{
if (likely(!skb->next)) {
diff --git a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
index 1640e07830..ec1d87aea8 100644
--- a/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/801-usb_serial_endpoint_size.patch
@@ -8,7 +8,7 @@
static int debug;
/* initially all NULL */
static struct usb_serial *serial_table[SERIAL_TTY_MINORS];
-@@ -833,7 +834,7 @@
+@@ -835,7 +836,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);
-@@ -1253,3 +1254,5 @@
+@@ -1255,3 +1256,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.27/921-gpio_spi_driver.patch b/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
index 6be8e26d7d..f9efb76a1b 100644
--- a/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/921-gpio_spi_driver.patch
@@ -362,7 +362,7 @@
obj-$(CONFIG_SPI_PXA2XX) += pxa2xx_spi.o
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -3854,6 +3854,11 @@
+@@ -3855,6 +3855,11 @@
W: http://www.ibm.com/developerworks/power/cell/
S: Supported