diff options
author | Nathan Scott <nathans@sgi.com> | 2006-06-20 08:56:23 +0400 |
---|---|---|
committer | Nathan Scott <nathans@sgi.com> | 2006-06-20 08:56:23 +0400 |
commit | 98174e46974323e4941c72e46345f7277755e146 (patch) | |
tree | c4644c8f38a519cfb3929d1175fc7107eefe48b9 /include/asm-mips/pci/bridge.h | |
parent | d8ce75324135ea7100124c1fff4ec5090a350607 (diff) | |
parent | 25f42b6af09e34c3f92107b36b5aa6edc2fdba2f (diff) | |
download | linux-98174e46974323e4941c72e46345f7277755e146.tar.xz |
Merge HEAD from ../linux-2.6
Diffstat (limited to 'include/asm-mips/pci/bridge.h')
-rw-r--r-- | include/asm-mips/pci/bridge.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/asm-mips/pci/bridge.h b/include/asm-mips/pci/bridge.h index b4ee995c56e6..0c45e7598f3f 100644 --- a/include/asm-mips/pci/bridge.h +++ b/include/asm-mips/pci/bridge.h @@ -15,6 +15,7 @@ #include <linux/types.h> #include <linux/pci.h> #include <asm/xtalk/xwidget.h> /* generic widget header */ +#include <asm/sn/types.h> /* I/O page size */ @@ -848,4 +849,6 @@ struct bridge_controller { extern void register_bridge_irq(unsigned int irq); extern int request_bridge_irq(struct bridge_controller *bc); +extern struct pci_ops bridge_pci_ops; + #endif /* _ASM_PCI_BRIDGE_H */ |