Merge branches 'release' and 'gpe-ack' into release

[linux-2.6-omap-h63xx.git] / arch / sh / drivers / pci / ops-r7780rp.c

diff --git a/arch/sh/drivers/pci/ops-r7780rp.c b/arch/sh/drivers/pci/ops-r7780rp.c
index f2216081ab85d5983bd8c5d4b4b282b362e6fc98..5fdadaeed6fcc0427746ac428a7908c9e26d4470 100644 (file)
--- a/arch/sh/drivers/pci/ops-r7780rp.c
+++ b/arch/sh/drivers/pci/ops-r7780rp.c
@@ -17,31 +17,19 @@
 #include <asm/io.h>
 #include "pci-sh4.h"
 
-static char r7780rp_irq_tab[] __initdata = {
-       0, 1, 2, 3,
-};
-
-static char r7780mp_irq_tab[] __initdata = {
+static char irq_tab[] __initdata = {
        65, 66, 67, 68,
 };
 
 int __init pcibios_map_platform_irq(struct pci_dev *pdev, u8 slot, u8 pin)
 {
-       if (mach_is_r7780rp())
-               return r7780rp_irq_tab[slot];
-       if (mach_is_r7780mp() || mach_is_r7785rp())
-               return r7780mp_irq_tab[slot];
-
-       printk(KERN_ERR "PCI: Bad IRQ mapping "
-              "request for slot %d, func %d\n", slot, pin-1);
-
-       return -1;
+       return irq_tab[slot];
 }
 
 static struct resource sh7780_io_resource = {
        .name   = "SH7780_IO",
-       .start  = 0x2000,
-       .end    = 0x2000 + SH7780_PCI_IO_SIZE - 1,
+       .start  = SH7780_PCI_IO_BASE,
+       .end    = SH7780_PCI_IO_BASE + SH7780_PCI_IO_SIZE - 1,
        .flags  = IORESOURCE_IO
 };