diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-15 06:57:47 +0200 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-07-15 06:57:47 +0200 |
| commit | b5f1bf48f2644ee7151674819f1c15c86dca87f1 (patch) | |
| tree | 2e3524ab1eb0a937c629062bec0bbc661f060bb2 /arch/powerpc/kernel/pci_64.c | |
| parent | powerpc: Make ppc_md.{halt, restart} __noreturn (diff) | |
| parent | powerpc: Initialise pci_io_base as early as possible (diff) | |
| download | linux-b5f1bf48f2644ee7151674819f1c15c86dca87f1.tar.xz linux-b5f1bf48f2644ee7151674819f1c15c86dca87f1.zip | |
Merge tag 'powerpc-4.7-5' into next
Pull in the fixes we sent during 4.7, we have code we want to merge into
next that depends on some of them.
Diffstat (limited to 'arch/powerpc/kernel/pci_64.c')
| -rw-r--r-- | arch/powerpc/kernel/pci_64.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c index f71b79a8992b..ed5e9ff61a68 100644 --- a/arch/powerpc/kernel/pci_64.c +++ b/arch/powerpc/kernel/pci_64.c @@ -47,7 +47,6 @@ static int __init pcibios_init(void) printk(KERN_INFO "PCI: Probing PCI hardware\n"); - pci_io_base = ISA_IO_BASE; /* For now, override phys_mem_access_prot. If we need it,g * later, we may move that initialization to each ppc_md */ |