aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@openwrt.org>2012-11-18 21:40:30 +0000
committerHauke Mehrtens <hauke@openwrt.org>2012-11-18 21:40:30 +0000
commit9f3fcfae178c909a28ed450d655898d4d78bea1d (patch)
treef118790a124cf3b56cea3f2288cdc35651bb6ca9 /target
parenta47fb21bf8c4966ecf91bb46d1f358ca26525490 (diff)
downloadupstream-9f3fcfae178c909a28ed450d655898d4d78bea1d.tar.gz
upstream-9f3fcfae178c909a28ed450d655898d4d78bea1d.tar.bz2
upstream-9f3fcfae178c909a28ed450d655898d4d78bea1d.zip
kernel: refresh patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34253 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-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