diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 11:32:12 +0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-06-02 11:32:12 +0400 |
| commit | 019e2574f965b800ba76f319d817eae9405ae064 (patch) | |
| tree | fbcf7ade183a8dd4a6c55a2596cf5cf47bbb76d4 /arch/sh/include/asm/machvec.h | |
| parent | 4705b2e8047221142af2ed5e37f54ac4c7f80a7d (diff) | |
| parent | 861160bfd097de7dbf3195bbef210e4f787327ab (diff) | |
| download | linux-019e2574f965b800ba76f319d817eae9405ae064.tar.xz | |
Merge branch 'sh/iomap'
Diffstat (limited to 'arch/sh/include/asm/machvec.h')
| -rw-r--r-- | arch/sh/include/asm/machvec.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h index bc0218cb72e1..a0b0cf79cf8a 100644 --- a/arch/sh/include/asm/machvec.h +++ b/arch/sh/include/asm/machvec.h @@ -19,6 +19,10 @@ struct sh_machine_vector { const char *mv_name; int mv_nr_irqs; + int (*mv_irq_demux)(int irq); + void (*mv_init_irq)(void); + +#ifdef CONFIG_HAS_IOPORT u8 (*mv_inb)(unsigned long); u16 (*mv_inw)(unsigned long); u32 (*mv_inl)(unsigned long); @@ -40,12 +44,9 @@ struct sh_machine_vector { void (*mv_outsw)(unsigned long, const void *src, unsigned long count); void (*mv_outsl)(unsigned long, const void *src, unsigned long count); - int (*mv_irq_demux)(int irq); - - void (*mv_init_irq)(void); - void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); void (*mv_ioport_unmap)(void __iomem *); +#endif int (*mv_clk_init)(void); int (*mv_mode_pins)(void); |