diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-06-04 16:53:02 -0400 |
| commit | f8647b506d7116a1a3accd8d618184096e85f50b (patch) | |
| tree | f10bc7201fda2a36c035548a0ea62210ad57adb6 /arch/mips/pci | |
| parent | 1d421ca9d7edbac1eb118631ee039d50ab54771e (diff) | |
| parent | f7a89f1b8eb598ac5da61c9795b3d847baa73d12 (diff) | |
Merge branch '3.15-fixes' into mips-for-linux-next
Diffstat (limited to 'arch/mips/pci')
| -rw-r--r-- | arch/mips/pci/pci-rc32434.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/pci/pci-rc32434.c b/arch/mips/pci/pci-rc32434.c index b128cb973ebe..7f6ce6d734c0 100644 --- a/arch/mips/pci/pci-rc32434.c +++ b/arch/mips/pci/pci-rc32434.c | |||
| @@ -53,7 +53,6 @@ static struct resource rc32434_res_pci_mem1 = { | |||
| 53 | .start = 0x50000000, | 53 | .start = 0x50000000, |
| 54 | .end = 0x5FFFFFFF, | 54 | .end = 0x5FFFFFFF, |
| 55 | .flags = IORESOURCE_MEM, | 55 | .flags = IORESOURCE_MEM, |
| 56 | .parent = &rc32434_res_pci_mem1, | ||
| 57 | .sibling = NULL, | 56 | .sibling = NULL, |
| 58 | .child = &rc32434_res_pci_mem2 | 57 | .child = &rc32434_res_pci_mem2 |
| 59 | }; | 58 | }; |