diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-01 21:37:32 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2009-05-01 21:37:32 +0000 |
| commit | 5ace08f5db5d8ef1aec2750ff7513449e0d8b640 (patch) | |
| tree | d98af5b2439eed8868d4d7ca0b77f328dc3f83a1 | |
| parent | 295d592403a6bb96b0cd1e5d7b52f449f2328bf3 (diff) | |
refresh patches for 2.6.30-rc4
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15548 3c298f89-4303-0410-b956-a3cf2f4a3e73
3 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch index 5760b8e9b6..af85c65513 100644 --- a/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch +++ b/target/linux/generic-2.6/patches-2.6.30/150-netfilter_imq.patch @@ -687,7 +687,7 @@ #include <linux/proc_fs.h> #include <linux/seq_file.h> #include <linux/stat.h> -@@ -1673,7 +1676,11 @@ int dev_hard_start_xmit(struct sk_buff * +@@ -1678,7 +1681,11 @@ int dev_hard_start_xmit(struct sk_buff * int rc; if (likely(!skb->next)) { diff --git a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch b/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch index cc6f916965..61730540fb 100644 --- a/target/linux/generic-2.6/patches-2.6.30/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic-2.6/patches-2.6.30/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]; -@@ -841,7 +842,7 @@ int usb_serial_probe(struct usb_interfac +@@ -857,7 +858,7 @@ int usb_serial_probe(struct usb_interfac 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); -@@ -1279,3 +1280,5 @@ MODULE_LICENSE("GPL"); +@@ -1311,3 +1312,5 @@ MODULE_LICENSE("GPL"); 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.30/922-gpiommc.patch b/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch index dbfa823a86..0fb8523d71 100644 --- a/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch +++ b/target/linux/generic-2.6/patches-2.6.30/922-gpiommc.patch @@ -824,7 +824,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2490,6 +2490,11 @@ T: git git://git.kernel.org/pub/scm/linu +@@ -2487,6 +2487,11 @@ T: git git://git.kernel.org/pub/scm/linu S: Maintained F: drivers/media/video/gspca/ |