diff options
| author | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-09-16 17:11:43 -0400 |
| commit | 2e57572a50a4de41c6cbc879a4866a312d4cd316 (patch) | |
| tree | c4f58ec96c06642c4b415b881d3f0a3b673d5b44 /arch/arm/mach-orion5x/common.h | |
| parent | 9b2e43ae4e9609f80034dfe8de895045cac52d77 (diff) | |
| parent | f948cc6ab9e61a8e88d70ee9aafc690e6d26f92c (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Conflicts:
arch/sparc64/kernel/pci_psycho.c
Diffstat (limited to 'arch/arm/mach-orion5x/common.h')
| -rw-r--r-- | arch/arm/mach-orion5x/common.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h index e75bd7004b94..0bd195551a27 100644 --- a/arch/arm/mach-orion5x/common.h +++ b/arch/arm/mach-orion5x/common.h | |||
| @@ -41,6 +41,7 @@ struct pci_bus; | |||
| 41 | struct pci_sys_data; | 41 | struct pci_sys_data; |
| 42 | 42 | ||
| 43 | void orion5x_pcie_id(u32 *dev, u32 *rev); | 43 | void orion5x_pcie_id(u32 *dev, u32 *rev); |
| 44 | void orion5x_pci_disable(void); | ||
| 44 | void orion5x_pci_set_cardbus_mode(void); | 45 | void orion5x_pci_set_cardbus_mode(void); |
| 45 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); | 46 | int orion5x_pci_sys_setup(int nr, struct pci_sys_data *sys); |
| 46 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); | 47 | struct pci_bus *orion5x_pci_sys_scan_bus(int nr, struct pci_sys_data *sys); |