diff options
| author | Peter Denison <openwrt@marshadder.org> | 2008-05-16 19:25:20 +0000 |
|---|---|---|
| committer | Peter Denison <openwrt@marshadder.org> | 2008-05-16 19:25:20 +0000 |
| commit | 3bf5361998a5fba7655e561d5a64539f5f4f716b (patch) | |
| tree | 887dd555500536c150c4a656732da6bde9443082 /target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch | |
| parent | 96e64476e367366badae5dea2d5d0fed7ed944dd (diff) | |
| download | master-187ad058-3bf5361998a5fba7655e561d5a64539f5f4f716b.tar.gz master-187ad058-3bf5361998a5fba7655e561d5a64539f5f4f716b.tar.bz2 master-187ad058-3bf5361998a5fba7655e561d5a64539f5f4f716b.zip | |
[generic-2.6] 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
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11155 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch')
| -rw-r--r-- | target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch index 132b41dc5d..0463da5615 100644 --- a/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch +++ b/target/linux/brcm47xx/patches-2.6.25/690-mips-allow-pciregister-after-boot.patch @@ -1,10 +1,10 @@ Allow registering PCI devices after early boot. This is an ugly hack and needs to be rewritten before going upstream. -Index: linux-2.6.23.16/arch/mips/pci/pci.c +Index: linux-2.6.25/arch/mips/pci/pci.c =================================================================== ---- linux-2.6.23.16.orig/arch/mips/pci/pci.c 2008-02-20 16:06:36.000000000 +0100 -+++ linux-2.6.23.16/arch/mips/pci/pci.c 2008-02-20 16:09:33.000000000 +0100 +--- linux-2.6.25.orig/arch/mips/pci/pci.c 2008-04-27 21:49:19.000000000 +0100 ++++ linux-2.6.25/arch/mips/pci/pci.c 2008-04-27 21:58:31.000000000 +0100 @@ -21,6 +21,17 @@ */ int pci_probe_only; @@ -146,11 +146,11 @@ Index: linux-2.6.23.16/arch/mips/pci/pci.c return 0; } -Index: linux-2.6.23.16/drivers/ssb/main.c +Index: linux-2.6.25/drivers/ssb/main.c =================================================================== ---- linux-2.6.23.16.orig/drivers/ssb/main.c 2008-02-20 16:06:36.000000000 +0100 -+++ linux-2.6.23.16/drivers/ssb/main.c 2008-02-20 18:33:21.000000000 +0100 -@@ -1185,9 +1185,7 @@ static int __init ssb_modinit(void) +--- linux-2.6.25.orig/drivers/ssb/main.c 2008-04-27 21:55:32.000000000 +0100 ++++ linux-2.6.25/drivers/ssb/main.c 2008-04-27 21:58:31.000000000 +0100 +@@ -1191,9 +1191,7 @@ 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. */ |