kernel: refresh patches
authorhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 18 Nov 2012 21:40:30 +0000 (21:40 +0000)
committerhauke <hauke@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Sun, 18 Nov 2012 21:40:30 +0000 (21:40 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34253 3c298f89-4303-0410-b956-a3cf2f4a3e73

target/linux/brcm47xx/patches-3.6/186-USB-EHCI-bcma-fix-driver.patch
target/linux/generic/patches-3.6/850-glamo_headers.patch

index b380034..9efb6df 100644 (file)
@@ -1,6 +1,6 @@
 --- a/drivers/usb/host/bcma-hcd.c
 +++ b/drivers/usb/host/bcma-hcd.c
 --- a/drivers/usb/host/bcma-hcd.c
 +++ b/drivers/usb/host/bcma-hcd.c
-@@ -45,7 +45,7 @@ static int bcma_wait_bits(struct bcma_de
+@@ -46,7 +46,7 @@ static int bcma_wait_bits(struct bcma_de
  
        for (i = 0; i < timeout; i++) {
                val = bcma_read32(dev, reg);
  
        for (i = 0; i < timeout; i++) {
                val = bcma_read32(dev, reg);
index d6d49fd..c75e1d6 100644 (file)
@@ -10,7 +10,7 @@
  #define FB_ACCEL_NEOMAGIC_NM2093 92   /* NeoMagic NM2093              */
 --- a/include/linux/Kbuild
 +++ b/include/linux/Kbuild
  #define FB_ACCEL_NEOMAGIC_NM2093 92   /* NeoMagic NM2093              */
 --- a/include/linux/Kbuild
 +++ b/include/linux/Kbuild
-@@ -145,6 +145,8 @@ header-y += generic_serial.h
+@@ -144,6 +144,8 @@ header-y += generic_serial.h
  header-y += genetlink.h
  header-y += gfs2_ondisk.h
  header-y += gigaset_dev.h
  header-y += genetlink.h
  header-y += gfs2_ondisk.h
  header-y += gigaset_dev.h