projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'server-cluster-locking-api' of git://linux-nfs.org/~bfields/linux
[powerpc.git]
/
include
/
asm-mips
/
pci.h
diff --git
a/include/asm-mips/pci.h
b/include/asm-mips/pci.h
index
c4d68be
..
3eea3ba
100644
(file)
--- a/
include/asm-mips/pci.h
+++ b/
include/asm-mips/pci.h
@@
-32,6
+32,7
@@
struct pci_controller {
unsigned long mem_offset;
struct resource *io_resource;
unsigned long io_offset;
unsigned long mem_offset;
struct resource *io_resource;
unsigned long io_offset;
+ unsigned long io_map_base;
unsigned int index;
/* For compatibility with current (as of July 2003) pciutils
unsigned int index;
/* For compatibility with current (as of July 2003) pciutils
@@
-187,4
+188,10
@@
static inline void pcibios_add_platform_entries(struct pci_dev *dev)
/* Do platform specific device initialization at pci_enable_device() time */
extern int pcibios_plat_dev_init(struct pci_dev *dev);
/* Do platform specific device initialization at pci_enable_device() time */
extern int pcibios_plat_dev_init(struct pci_dev *dev);
+/* Chances are this interrupt is wired PC-style ... */
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+ return channel ? 15 : 14;
+}
+
#endif /* _ASM_PCI_H */
#endif /* _ASM_PCI_H */