diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-11 16:07:21 +0000 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2010-12-11 16:07:21 +0000 |
| commit | b8ab3d34eb9b03a73c061f535a086ee4f748c88e (patch) | |
| tree | d1680843a8d80d29e7e12831bef5576d1c5bfe15 /target/linux/generic | |
| parent | 82ac7bb00a712cb203fb2d920c140ffb2d78fb45 (diff) | |
| download | upstream-b8ab3d34eb9b03a73c061f535a086ee4f748c88e.tar.gz upstream-b8ab3d34eb9b03a73c061f535a086ee4f748c88e.tar.bz2 upstream-b8ab3d34eb9b03a73c061f535a086ee4f748c88e.zip | |
kernel: update kernel versions Update kernel 2.6.32.26 to 2.6.32.27 Update kenrel 2.6.36.1 to 2.6.36.2
SVN-Revision: 24486
Diffstat (limited to 'target/linux/generic')
| -rw-r--r-- | target/linux/generic/patches-2.6.32/922-gpiommc.patch | 2 | ||||
| -rw-r--r-- | target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/generic/patches-2.6.32/922-gpiommc.patch b/target/linux/generic/patches-2.6.32/922-gpiommc.patch index 8c995874a8..aef06810ab 100644 --- a/target/linux/generic/patches-2.6.32/922-gpiommc.patch +++ b/target/linux/generic/patches-2.6.32/922-gpiommc.patch @@ -829,7 +829,7 @@ +be done automatically. --- a/MAINTAINERS +++ b/MAINTAINERS -@@ -2377,6 +2377,11 @@ T: git git://git.kernel.org/pub/scm/linu +@@ -2383,6 +2383,11 @@ T: git git://git.kernel.org/pub/scm/linu S: Maintained F: drivers/media/video/gspca/ diff --git a/target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch b/target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch index 00a1a860ef..dba6aaf434 100644 --- a/target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch +++ b/target/linux/generic/patches-2.6.36/801-usb_serial_endpoint_size.patch @@ -1,6 +1,6 @@ --- a/drivers/usb/serial/usb-serial.c +++ b/drivers/usb/serial/usb-serial.c -@@ -61,6 +61,7 @@ static struct usb_driver usb_serial_driv +@@ -62,6 +62,7 @@ static struct usb_driver usb_serial_driv drivers depend on it. */ @@ -8,7 +8,7 @@ static int debug; /* initially all NULL */ static struct usb_serial *serial_table[SERIAL_TTY_MINORS]; -@@ -901,7 +902,7 @@ int usb_serial_probe(struct usb_interfac +@@ -902,7 +903,7 @@ int usb_serial_probe(struct usb_interfac } buffer_size = serial->type->bulk_in_size; if (!buffer_size) @@ -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); -@@ -1373,3 +1374,5 @@ MODULE_LICENSE("GPL"); +@@ -1376,3 +1377,5 @@ MODULE_LICENSE("GPL"); module_param(debug, bool, S_IRUGO | S_IWUSR); MODULE_PARM_DESC(debug, "Debug enabled or not"); |