aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2012-11-18 21:40:30 +0000
committerHauke Mehrtens <hauke@hauke-m.de>2012-11-18 21:40:30 +0000
commit4fa5781a959b0711c5cd8c57a2a55b7ba2528503 (patch)
treed45bd470c36c75facf7ac32333854d81a8e3f879 /target/linux
parent86cc79ac985ffd954d26c88d144b82063a714636 (diff)
downloadupstream-4fa5781a959b0711c5cd8c57a2a55b7ba2528503.tar.gz
upstream-4fa5781a959b0711c5cd8c57a2a55b7ba2528503.tar.bz2
upstream-4fa5781a959b0711c5cd8c57a2a55b7ba2528503.zip
kernel: refresh patches
SVN-Revision: 34253
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/brcm47xx/patches-3.6/186-USB-EHCI-bcma-fix-driver.patch2
-rw-r--r--target/linux/generic/patches-3.6/850-glamo_headers.patch2
2 files changed, 2 insertions, 2 deletions
diff --git a/target/linux/brcm47xx/patches-3.6/186-USB-EHCI-bcma-fix-driver.patch b/target/linux/brcm47xx/patches-3.6/186-USB-EHCI-bcma-fix-driver.patch
index b3800340c8..9efb6df6a6 100644
--- a/target/linux/brcm47xx/patches-3.6/186-USB-EHCI-bcma-fix-driver.patch
+++ b/target/linux/brcm47xx/patches-3.6/186-USB-EHCI-bcma-fix-driver.patch
@@ -1,6 +1,6 @@
--- 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);
diff --git a/target/linux/generic/patches-3.6/850-glamo_headers.patch b/target/linux/generic/patches-3.6/850-glamo_headers.patch
index d6d49fdf50..c75e1d62ea 100644
--- a/target/linux/generic/patches-3.6/850-glamo_headers.patch
+++ b/target/linux/generic/patches-3.6/850-glamo_headers.patch
@@ -10,7 +10,7 @@
#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