diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:48 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2019-02-13 20:31:48 +0100 |
| commit | f5a25b2639e0889e02db5e86080559019c567a1f (patch) | |
| tree | 00f34fe4aeec434f2770d70e9de2bec128e7b465 /arch/mips | |
| parent | 9a9326ef9a37c838edeeb960232b0c9f1126bda0 (diff) | |
| parent | 3701a58eb9c81820d955d63c7a03e873baf86cae (diff) | |
| download | barebox-f5a25b2639e0889e02db5e86080559019c567a1f.tar.gz barebox-f5a25b2639e0889e02db5e86080559019c567a1f.tar.xz | |
Merge branch 'for-next/pci'
Diffstat (limited to 'arch/mips')
| -rw-r--r-- | arch/mips/mach-malta/pci.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/mach-malta/pci.c b/arch/mips/mach-malta/pci.c index 47c0e228a7..4561123d22 100644 --- a/arch/mips/mach-malta/pci.c +++ b/arch/mips/mach-malta/pci.c @@ -131,7 +131,8 @@ static int gt64xxx_pci0_pcibios_write(struct pci_bus *bus, unsigned int devfn, } /* function returns memory address for begin of pci resource */ -static int gt64xxx_res_start(struct pci_bus *bus, resource_size_t res_addr) +static resource_size_t gt64xxx_res_start(struct pci_bus *bus, + resource_size_t res_addr) { return KSEG0ADDR(res_addr); } |