summaryrefslogtreecommitdiffstats
path: root/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
diff options
context:
space:
mode:
authorPeter Denison <openwrt@marshadder.org>2008-05-16 19:25:20 +0000
committerPeter Denison <openwrt@marshadder.org>2008-05-16 19:25:20 +0000
commit79aed699d71b9f583762a4b184bb7a68521dccb9 (patch)
tree74aaab10bc8d14ea76857a0ea17fc31419d255e9 /target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
parent9788ab458ceb294131f6145eba79dfd01e380ffc (diff)
downloadmaster-31e0f0ae-79aed699d71b9f583762a4b184bb7a68521dccb9.tar.gz
master-31e0f0ae-79aed699d71b9f583762a4b184bb7a68521dccb9.tar.bz2
master-31e0f0ae-79aed699d71b9f583762a4b184bb7a68521dccb9.zip
Remove files now present upstream in files-2.6.25 (This is mostly just drivers/ssb and include/linux/ssb) [brcm47xx] Regenerate patches against 2.6.25.1 kernel+files set Default is still to build against 2.6.23.16
SVN-Revision: 11155
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch')
-rw-r--r--target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch b/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
index a36c046018..1efaf7c3f8 100644
--- a/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
+++ b/target/linux/brcm47xx/patches-2.6.25/620-ssb-modinit-fix.patch
@@ -1,8 +1,8 @@
-Index: linux-2.6.23.16/drivers/ssb/main.c
+Index: linux-2.6.25.1/drivers/ssb/main.c
===================================================================
---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-19 12:38:34.000000000 +0100
-+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-19 12:48:25.000000000 +0100
-@@ -1163,7 +1163,9 @@ static int __init ssb_modinit(void)
+--- linux-2.6.25.1.orig/drivers/ssb/main.c 2008-05-10 08:35:23.000000000 +0100
++++ linux-2.6.25.1/drivers/ssb/main.c 2008-05-10 09:04:53.000000000 +0100
+@@ -1173,7 +1173,9 @@ static int __init ssb_modinit(void)
/* ssb must be initialized after PCI but before the ssb drivers.
* That means we must use some initcall between subsys_initcall
* and device_initcall. */