From 0db8d6927881d50d0ca944093a72bf082ff9f7d3 Mon Sep 17 00:00:00 2001 From: Haavard Skinnemoen Date: Mon, 22 Oct 2007 15:51:04 +0200 Subject: [PATCH] --- yaml --- r: 72203 b: refs/heads/master c: 86298962c06c2584a8c4df5fb92a70179ca7e4f5 h: refs/heads/master i: 72201: 7e4dc3fa5c6b2b4a04c8fe1974f173120d4a9cea 72199: 474ba85b58e6d2d820c6413ddd8a6776cf181a27 v: v3 --- [refs] | 2 +- trunk/arch/avr32/mach-at32ap/extint.c | 2 +- trunk/arch/avr32/mach-at32ap/pm.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index bf490f34c399..cfc52896cb52 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1c2f173796e4d692b71d1305adb833a104713cd8 +refs/heads/master: 86298962c06c2584a8c4df5fb92a70179ca7e4f5 diff --git a/trunk/arch/avr32/mach-at32ap/extint.c b/trunk/arch/avr32/mach-at32ap/extint.c index 8acd01090031..f5bfd4c81fe7 100644 --- a/trunk/arch/avr32/mach-at32ap/extint.c +++ b/trunk/arch/avr32/mach-at32ap/extint.c @@ -142,7 +142,7 @@ static int eic_set_irq_type(unsigned int irq, unsigned int flow_type) return ret; } -struct irq_chip eic_chip = { +static struct irq_chip eic_chip = { .name = "eic", .ack = eic_ack_irq, .mask = eic_mask_irq, diff --git a/trunk/arch/avr32/mach-at32ap/pm.h b/trunk/arch/avr32/mach-at32ap/pm.h index 47efd0d1951f..694d521edc2f 100644 --- a/trunk/arch/avr32/mach-at32ap/pm.h +++ b/trunk/arch/avr32/mach-at32ap/pm.h @@ -113,8 +113,8 @@ /* Register access macros */ #define pm_readl(reg) \ - __raw_readl((void __iomem *)AT32_PM_BASE + PM_##reg) + __raw_readl((void __iomem __force *)AT32_PM_BASE + PM_##reg) #define pm_writel(reg,value) \ - __raw_writel((value), (void __iomem *)AT32_PM_BASE + PM_##reg) + __raw_writel((value), (void __iomem __force *)AT32_PM_BASE + PM_##reg) #endif /* __ARCH_AVR32_MACH_AT32AP_PM_H__ */