diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:57:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-18 16:57:24 -0700 |
| commit | 722874465e3cd3268387b96e02220f84b35a8d98 (patch) | |
| tree | 52f453acb7274ce8e939cf2d5f6ee748b826ef15 /arch/microblaze/include/asm/prom.h | |
| parent | 31cc1dd344d941358345bd02f24c629dada9b08c (diff) | |
| parent | 841d6e8c4e969b2cdd80f7216af34d932c41b1a6 (diff) | |
| download | kernel_samsung_smdk4412-722874465e3cd3268387b96e02220f84b35a8d98.zip kernel_samsung_smdk4412-722874465e3cd3268387b96e02220f84b35a8d98.tar.gz kernel_samsung_smdk4412-722874465e3cd3268387b96e02220f84b35a8d98.tar.bz2 | |
Merge branch 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze
* 'for-linus' of git://git.monstr.eu/linux-2.6-microblaze: (27 commits)
microblaze: entry.S use delay slot for return handlers
microblaze: Save current task directly
microblaze: Simplify entry.S - save/restore r3/r4 - ret_from_trap
microblaze: PCI early support for noMMU system
microblaze: Fix dma alloc and free coherent dma functions
microblaze: Add consistent code
microblaze: pgtable.h: move consistent functions
microblaze: Remove ancient Kconfig option for consistent mapping
microblaze: Remove VMALLOC_VMADDR
microblaze: Add define for ASM_LOOP
microblaze: Preliminary support for dma drivers
microblaze: remove trailing space in messages
microblaze: Use generic show_mem()
microblaze: Change temp register for cmdline
microblaze: Preliminary support for dma drivers
microblaze: Move cache function to cache.c
microblaze: Add support from PREEMPT
microblaze: Add support for Xilinx PCI host bridge
microblaze: Enable PCI, missing files
microblaze: Add core PCI files
...
Diffstat (limited to 'arch/microblaze/include/asm/prom.h')
| -rw-r--r-- | arch/microblaze/include/asm/prom.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h index 03f45a9..e7d67a3 100644 --- a/arch/microblaze/include/asm/prom.h +++ b/arch/microblaze/include/asm/prom.h @@ -31,6 +31,21 @@ /* Other Prototypes */ extern int early_uartlite_console(void); +#ifdef CONFIG_PCI +/* + * PCI <-> OF matching functions + * (XXX should these be here?) + */ +struct pci_bus; +struct pci_dev; +extern int pci_device_from_OF_node(struct device_node *node, + u8 *bus, u8 *devfn); +extern struct device_node *pci_busdev_to_OF_node(struct pci_bus *bus, + int devfn); +extern struct device_node *pci_device_to_OF_node(struct pci_dev *dev); +extern void pci_create_OF_bus_map(void); +#endif + /* * OF address retreival & translation */ |