summaryrefslogtreecommitdiff
path: root/target/mips
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2014-05-16 16:02:43 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-05-16 16:23:28 +0200
commit91718c8e02f593e647331db33b0fd24877342899 (patch)
treeca0e5fe96ffb69ee0457c66c7624a8ba134f9a80 /target/mips
parent19397a95a7d27ed882fe4e3ae68b99daf408082e (diff)
fix pic register
Diffstat (limited to 'target/mips')
-rw-r--r--target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch37
1 files changed, 11 insertions, 26 deletions
diff --git a/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch b/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch
index 73d977e08..173e49c35 100644
--- a/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch
+++ b/target/mips/mikrotik-rb532/patches/3.15-rc5/rb532-pci.patch
@@ -1,26 +1,11 @@
-diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci.c linux-3.15-rc5/arch/mips/pci/pci.c
---- linux-3.15-rc5.orig/arch/mips/pci/pci.c 2014-05-09 22:10:52.000000000 +0200
-+++ linux-3.15-rc5/arch/mips/pci/pci.c 2014-05-10 21:18:58.000000000 +0200
-@@ -166,20 +166,10 @@
-
- void register_pci_controller(struct pci_controller *hose)
- {
-- struct resource *parent;
--
-- parent = hose->mem_resource->parent;
-- if (!parent)
-- parent = &iomem_resource;
--
-- if (request_resource(parent, hose->mem_resource) < 0)
-+ if (request_resource(&iomem_resource, hose->mem_resource) < 0)
- goto out;
-
-- parent = hose->io_resource->parent;
-- if (!parent)
-- parent = &ioport_resource;
--
-- if (request_resource(parent, hose->io_resource) < 0) {
-+ if (request_resource(&ioport_resource, hose->io_resource) < 0) {
- release_resource(hose->mem_resource);
- goto out;
- }
+diff -Nur linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c linux-3.15-rc5/arch/mips/pci/pci-rc32434.c
+--- linux-3.15-rc5.orig/arch/mips/pci/pci-rc32434.c 2014-05-09 22:10:52.000000000 +0200
++++ linux-3.15-rc5/arch/mips/pci/pci-rc32434.c 2014-05-16 10:38:10.000000000 +0200
+@@ -53,7 +53,6 @@
+ .start = 0x50000000,
+ .end = 0x5FFFFFFF,
+ .flags = IORESOURCE_MEM,
+- .parent = &rc32434_res_pci_mem1,
+ .sibling = NULL,
+ .child = &rc32434_res_pci_mem2
+ };