diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-06-25 01:20:01 +0000 |
| commit | 3797ba0b62debb71af4606910acacc9896a9ae3b (patch) | |
| tree | 414eea76253c7871bfdf3bd9d1817771eb40917c /include/asm-ppc | |
| parent | 2b6c0c580795a4404f72d2a794214dd9e080709d (diff) | |
Merge with Linux 2.4.0-test2.
Diffstat (limited to 'include/asm-ppc')
| -rw-r--r-- | include/asm-ppc/byteorder.h | 2 | ||||
| -rw-r--r-- | include/asm-ppc/pci.h | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/asm-ppc/byteorder.h b/include/asm-ppc/byteorder.h index c45dba13b..0fdd67844 100644 --- a/include/asm-ppc/byteorder.h +++ b/include/asm-ppc/byteorder.h @@ -38,7 +38,7 @@ extern __inline__ void st_le32(volatile unsigned *addr, const unsigned val) /* alas, egcs sounds like it has a bug in this code that doesn't use the inline asm correctly, and can cause file corruption. Until I hear that it's fixed, I can live without the extra speed. I hope. */ -#if !((__GNUC__ > 2) || (__GNUC__ == 2 && __GNUC_MINOR__ >= 90)) +#if !(__GNUC__ >= 2 && __GNUC_MINOR__ >= 90) #if 0 # define __arch_swab16(x) ld_le16(&x) # define __arch_swab32(x) ld_le32(&x) diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h index 479f8ba2c..26fe498dc 100644 --- a/include/asm-ppc/pci.h +++ b/include/asm-ppc/pci.h @@ -15,6 +15,11 @@ extern inline void pcibios_set_master(struct pci_dev *dev) /* No special bus mastering setup handling */ } +extern inline void pcibios_penalize_isa_irq(int irq) +{ + /* We don't do dynamic PCI IRQ allocation */ +} + /* Dynamic DMA Mapping stuff * ++ajoshi */ |