diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-31 21:12:40 +0100 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-10-31 21:12:40 +0100 |
| commit | 33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5 (patch) | |
| tree | 5e92465442ad3166ba1c9bd423c20d67b018d1e0 /arch/mn10300/include/asm/pci.h | |
| parent | Merge branch 'pci/yijing-mps-v1' into next (diff) | |
| parent | PCI: Report pci_pme_active() kmalloc failure (diff) | |
| download | linux-33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5.tar.xz linux-33de1b8bf6e11a3bc69faf2f7ffb3692c723bdf5.zip | |
Merge branch 'pci/misc' into next
* pci/misc:
PCI: Report pci_pme_active() kmalloc failure
mn10300/PCI: Remove useless pcibios_last_bus
frv/PCI: Remove pcibios_last_bus
PCI: Fail MSI/MSI-X initialization if device is not in PCI_D0
x86/PCI: Coalesce multiple overlapping host bridge windows
MAINTAINERS: Add arch/x86/pci to PCI file patterns
PCI/PM: Remove pci_pm_complete()
PCI: Add pci_dev_show_local_cpu() to simplify code
mn10300/PCI: Remove unused pci_mem_start
cris/PCI: Remove unused pci_mem_start
PCI: Make pci_dev_pm_ops static
Conflicts:
drivers/pci/pci-sysfs.c
Diffstat (limited to 'arch/mn10300/include/asm/pci.h')
| -rw-r--r-- | arch/mn10300/include/asm/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mn10300/include/asm/pci.h b/arch/mn10300/include/asm/pci.h index 6f31cc0f1a87..166323824683 100644 --- a/arch/mn10300/include/asm/pci.h +++ b/arch/mn10300/include/asm/pci.h @@ -44,7 +44,6 @@ extern void unit_pci_init(void); #define pcibios_assign_all_busses() 0 #endif -extern unsigned long pci_mem_start; #define PCIBIOS_MIN_IO 0xBE000004 #define PCIBIOS_MIN_MEM 0xB8000000 |