diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-10-19 16:16:18 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2006-10-19 16:30:32 +0900 |
| commit | 082c44d20eb4c6c4aa60ae7429ea184854cb0610 (patch) | |
| tree | c5efa4df65c1e0f90196f04a8760f5d3997eddbf /arch/sh/cchips | |
| parent | 4a58eaca7ca68abea37d6d2a4ea7deb394906183 (diff) | |
| download | linux-082c44d20eb4c6c4aa60ae7429ea184854cb0610.tar.gz linux-082c44d20eb4c6c4aa60ae7429ea184854cb0610.tar.bz2 linux-082c44d20eb4c6c4aa60ae7429ea184854cb0610.zip | |
sh: Cleanup board header directories.
Now with the ide.h mess sorted out, most of these boards
don't need their own directory. Move the headers out, and
update the driver paths.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/cchips')
| -rw-r--r-- | arch/sh/cchips/voyagergx/irq.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c index bf1b28feca06..f7ea700d05ae 100644 --- a/arch/sh/cchips/voyagergx/irq.c +++ b/arch/sh/cchips/voyagergx/irq.c @@ -17,29 +17,18 @@ Copyright 2003 (c) Lineo uSolutions,Inc. */ -/* -------------------------------------------------------------------- */ - -#undef DEBUG - -#include <linux/sched.h> -#include <linux/module.h> -#include <linux/kernel.h> -#include <linux/param.h> -#include <linux/ioport.h> #include <linux/interrupt.h> #include <linux/init.h> -#include <linux/irq.h> - -#include <asm/io.h> -#include <asm/irq.h> +#include <linux/io.h> #include <asm/voyagergx.h> +#include <asm/rts7751r2d.h> static void disable_voyagergx_irq(unsigned int irq) { unsigned long val; unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE); - pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask); + pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask); val = inl(VOYAGER_INT_MASK); val &= ~mask; outl(val, VOYAGER_INT_MASK); @@ -50,7 +39,7 @@ static void enable_voyagergx_irq(unsigned int irq) unsigned long val; unsigned long mask = 1 << (irq - VOYAGER_IRQ_BASE); - pr_debug("disable_voyagergx_irq(%d): mask=%x\n", irq, mask); + pr_debug("disable_voyagergx_irq(%d): mask=%lx\n", irq, mask); val = inl(VOYAGER_INT_MASK); val |= mask; outl(val, VOYAGER_INT_MASK); @@ -137,7 +126,7 @@ int voyagergx_irq_demux(int irq) } else { printk("Unexpected IRQ irq = %d status = 0x%08lx\n", irq, val); } - pr_debug("voyagergx_irq_demux %d \n", i); + pr_debug("voyagergx_irq_demux %ld\n", i); #else for (bit = 1, i = 0 ; i < VOYAGER_IRQ_NUM ; bit <<= 1, i++) if (val & bit) @@ -185,4 +174,3 @@ void __init setup_voyagergx_irq(void) setup_irq(IRQ_VOYAGER, &irq0); } - |