diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 14:34:09 -0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /arch/sh/include/asm/machvec.h | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'arch/sh/include/asm/machvec.h')
| -rw-r--r-- | arch/sh/include/asm/machvec.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h index b2e4124070ae..f1bae02ef7b6 100644 --- a/arch/sh/include/asm/machvec.h +++ b/arch/sh/include/asm/machvec.h | |||
| @@ -42,13 +42,6 @@ struct sh_machine_vector { | |||
| 42 | void (*mv_outsw)(unsigned long, const void *src, unsigned long count); | 42 | void (*mv_outsw)(unsigned long, const void *src, unsigned long count); |
| 43 | void (*mv_outsl)(unsigned long, const void *src, unsigned long count); | 43 | void (*mv_outsl)(unsigned long, const void *src, unsigned long count); |
| 44 | 44 | ||
| 45 | u8 (*mv_readb)(void __iomem *); | ||
| 46 | u16 (*mv_readw)(void __iomem *); | ||
| 47 | u32 (*mv_readl)(void __iomem *); | ||
| 48 | void (*mv_writeb)(u8, void __iomem *); | ||
| 49 | void (*mv_writew)(u16, void __iomem *); | ||
| 50 | void (*mv_writel)(u32, void __iomem *); | ||
| 51 | |||
| 52 | int (*mv_irq_demux)(int irq); | 45 | int (*mv_irq_demux)(int irq); |
| 53 | 46 | ||
| 54 | void (*mv_init_irq)(void); | 47 | void (*mv_init_irq)(void); |