git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-parisc
/
pci.h
diff --git
a/include/asm-parisc/pci.h
b/include/asm-parisc/pci.h
index
fe7f6a2
..
7b3be9a
100644
(file)
--- a/
include/asm-parisc/pci.h
+++ b/
include/asm-parisc/pci.h
@@
-1,7
+1,6
@@
#ifndef __ASM_PARISC_PCI_H
#define __ASM_PARISC_PCI_H
#ifndef __ASM_PARISC_PCI_H
#define __ASM_PARISC_PCI_H
-#include <linux/config.h>
#include <asm/scatterlist.h>
#include <asm/scatterlist.h>
@@
-150,7
+149,7
@@
extern int parisc_bus_is_phys; /* in arch/parisc/kernel/setup.c */
/*
** Most PCI devices (eg Tulip, NCR720) also export the same registers
** to both MMIO and I/O port space. Due to poor performance of I/O Port
/*
** Most PCI devices (eg Tulip, NCR720) also export the same registers
** to both MMIO and I/O port space. Due to poor performance of I/O Port
-** access under HP PCI bus adapters, strongly rec
comend
use of MMIO
+** access under HP PCI bus adapters, strongly rec
ommend the
use of MMIO
** address space.
**
** While I'm at it more PA programming notes:
** address space.
**
** While I'm at it more PA programming notes:
@@
-289,4
+288,14
@@
static inline void pcibios_add_platform_entries(struct pci_dev *dev)
{
}
{
}
+static inline void pcibios_penalize_isa_irq(int irq, int active)
+{
+ /* We don't need to penalize isa irq's */
+}
+
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+ return channel ? 15 : 14;
+}
+
#endif /* __ASM_PARISC_PCI_H */
#endif /* __ASM_PARISC_PCI_H */