From 6c288e1eee58b72cb76b346bbd6d4a3ac75701b6 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Thu, 16 Oct 2008 13:49:10 -0700 Subject: [PATCH] Sync mach-omap2/irq.c with mainline Remove now unncessary casts and use the same order for include files. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/irq.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 598392649cd..68aff9ad8d4 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -13,9 +13,10 @@ #include #include #include +#include #include #include -#include + /* selected INTC register offsets */ @@ -51,12 +52,12 @@ static struct omap_irq_bank { static void intc_bank_write_reg(u32 val, struct omap_irq_bank *bank, u16 reg) { - __raw_writel(val, (__force void __iomem *)(bank->base_reg + reg)); + __raw_writel(val, bank->base_reg + reg); } static u32 intc_bank_read_reg(struct omap_irq_bank *bank, u16 reg) { - return __raw_readl((__force void __iomem *)(bank->base_reg + reg)); + return __raw_readl(bank->base_reg + reg); } /* XXX: FIQ and additional INTC support (only MPU at the moment) */ -- 2.41.0