diff options
| author | Rob Herring | 2013-11-07 17:34:46 +0100 |
|---|---|---|
| committer | Rob Herring | 2013-11-07 17:34:46 +0100 |
| commit | b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24 (patch) | |
| tree | b5fcb00387a838beb2bcf2f8ed2fd3d6d460c8ae /arch/microblaze/include/asm | |
| parent | MIPS: Netlogic: replace early_init_devtree() call (diff) | |
| parent | of/irq: Fix potential buffer overflow (diff) | |
| download | kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.gz kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.tar.xz kernel-qcow2-linux-b5480950c6cbb7b07ab1c1a5af0dc661a1cb6f24.zip | |
Merge remote-tracking branch 'grant/devicetree/next' into for-next
Diffstat (limited to 'arch/microblaze/include/asm')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index d52abb6812fa..935f9bec414a 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -127,8 +127,6 @@ extern void of_scan_pci_bridge(struct device_node *node, extern void of_scan_bus(struct device_node *node, struct pci_bus *bus); extern void of_rescan_bus(struct device_node *node, struct pci_bus *bus); -extern int pci_read_irq_line(struct pci_dev *dev); - extern int pci_bus_find_capability(struct pci_bus *bus, unsigned int devfn, int cap); |