diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-07-26 09:26:29 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-07-26 09:26:29 +0200 |
| commit | 5e580523d9128a4d8364fe89d36c38fc7819c8dd (patch) | |
| tree | 852fb2427d980830ae8686a91e4ca5873f259ab9 /arch/powerpc/kernel/pci_64.c | |
| parent | Merge branch 'for-next' of http://git.agner.ch/git/linux-drm-fsl-dcu into drm... (diff) | |
| parent | Linux 4.7 (diff) | |
| download | linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.tar.xz linux-5e580523d9128a4d8364fe89d36c38fc7819c8dd.zip | |
Backmerge tag 'v4.7' into drm-next
Linux 4.7
As requested by Daniel Vetter as the conflicts were getting messy.
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 3759df52bd67..a5ae49a2dcc4 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 */ |