diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-05-22 06:29:37 +0200 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-05-22 06:29:37 +0200 |
| commit | 5f8371cec93b94a24a55ba1de642ce6eade6d62c (patch) | |
| tree | 61b6d2acb10226b3c0f2d31bda3a49288e540eba /arch/sh/boards/mach-cayman/irq.c | |
| parent | video: stop sh_mobile_lcdcfb only if started (diff) | |
| parent | sh: irq: Provide an arch_probe_nr_irqs() that wraps the machvec def. (diff) | |
| download | linux-5f8371cec93b94a24a55ba1de642ce6eade6d62c.tar.xz linux-5f8371cec93b94a24a55ba1de642ce6eade6d62c.zip | |
Merge branches 'sh/stable-updates' and 'sh/sparseirq'
Diffstat (limited to 'arch/sh/boards/mach-cayman/irq.c')
| -rw-r--r-- | arch/sh/boards/mach-cayman/irq.c | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/sh/boards/mach-cayman/irq.c b/arch/sh/boards/mach-cayman/irq.c index da62ad516994..33f770856319 100644 --- a/arch/sh/boards/mach-cayman/irq.c +++ b/arch/sh/boards/mach-cayman/irq.c @@ -142,26 +142,11 @@ int cayman_irq_demux(int evt) return irq; } -#if defined(CONFIG_PROC_FS) && defined(CONFIG_SYSCTL) -int cayman_irq_describe(char* p, int irq) -{ - if (irq < NR_INTC_IRQS) { - return intc_irq_describe(p, irq); - } else if (irq < NR_INTC_IRQS + 8) { - return sprintf(p, "(SMSC %d)", irq - NR_INTC_IRQS); - } else if ((irq >= NR_INTC_IRQS + 24) && (irq < NR_INTC_IRQS + 32)) { - return sprintf(p, "(PCI2 %d)", irq - (NR_INTC_IRQS + 24)); - } - - return 0; -} -#endif - void init_cayman_irq(void) { int i; - epld_virt = onchip_remap(EPLD_BASE, 1024, "EPLD"); + epld_virt = (unsigned long)ioremap_nocache(EPLD_BASE, 1024); if (!epld_virt) { printk(KERN_ERR "Cayman IRQ: Unable to remap EPLD\n"); return; |