diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-24 08:44:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-06-24 08:44:40 -0700 |
| commit | aaa64485267c14e79382fbf7f4b0689a5de94fe9 (patch) | |
| tree | f12d6a74ff8d5f6582c81ec5657e39666d050a86 /arch/microblaze/include/asm | |
| parent | 6eae81a5e2d6646a61146501fd3032a340863c1d (diff) | |
| parent | c4fa9a6ae285ec4777d0524a4ee9c9039a5a4c28 (diff) | |
Merge tag 'microblaze-4.2-rc1' of git://git.monstr.eu/linux-2.6-microblaze
Pull Microblaze updates from Michal Simek:
- some PCI fixups
- add new MB versions
- sparse fixups
* tag 'microblaze-4.2-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
microblaze/PCI: Remove unnecessary struct pci_dev declaration
microblaze/PCI: Remove unnecessary pci_bus_find_capability() declaration
microblaze/PCI: Remove unused declarations
microblaze: Label local function static
microblaze: Add missing release version code
Diffstat (limited to 'arch/microblaze/include/asm')
| -rw-r--r-- | arch/microblaze/include/asm/pci.h | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h index fdf2e75d7033..b42ed684b945 100644 --- a/arch/microblaze/include/asm/pci.h +++ b/arch/microblaze/include/asm/pci.h @@ -27,8 +27,6 @@ #define PCIBIOS_MIN_IO 0x1000 #define PCIBIOS_MIN_MEM 0x10000000 -struct pci_dev; - /* Values for the `which' argument to sys_pciconfig_iobase syscall. */ #define IOBASE_BRIDGE_NUMBER 0 #define IOBASE_MEMORY 1 @@ -79,21 +77,6 @@ extern void pcibios_finish_adding_to_bus(struct pci_bus *bus); extern void pcibios_resource_survey(void); -extern struct pci_controller *init_phb_dynamic(struct device_node *dn); -extern int remove_phb_dynamic(struct pci_controller *phb); - -extern struct pci_dev *of_create_pci_dev(struct device_node *node, - struct pci_bus *bus, int devfn); - -extern void of_scan_pci_bridge(struct device_node *node, - struct pci_dev *dev); - -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_bus_find_capability(struct pci_bus *bus, - unsigned int devfn, int cap); - struct file; extern pgprot_t pci_phys_mem_access_prot(struct file *file, unsigned long pfn, |