From 74ed307c1e14b64fff77fc8394a134162f2a8e16 Mon Sep 17 00:00:00 2001 From: juhosg Date: Fri, 12 Nov 2010 18:51:21 +0000 Subject: [PATCH] ar71xx: fix inline attribute location Signed-off-by: Arnaud Lacombe git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23978 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ar71xx/files/arch/mips/ar71xx/prom.c | 2 +- target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h | 4 ++-- target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c index 2accbf8f20..c40dae319a 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/prom.c @@ -124,7 +124,7 @@ static int __init ar71xx_use__image_cmdline(void) return 1; } #else -static int inline ar71xx_use__image_cmdline(void) { return 0; } +static inline int ar71xx_use__image_cmdline(void) { return 0; } #endif static __init void ar71xx_prom_init_cmdline(int argc, char **argv) diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h index b370cf6bcc..42c07cd533 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx.h @@ -432,7 +432,7 @@ static inline u32 ag71xx_mii_ctrl_rr(struct ag71xx *ag) return __raw_readl(ag->mii_ctrl); } -static void inline ag71xx_mii_ctrl_set_if(struct ag71xx *ag, +static inline void ag71xx_mii_ctrl_set_if(struct ag71xx *ag, unsigned int mii_if) { u32 t; @@ -443,7 +443,7 @@ static void inline ag71xx_mii_ctrl_set_if(struct ag71xx *ag, ag71xx_mii_ctrl_wr(ag, t); } -static void inline ag71xx_mii_ctrl_set_speed(struct ag71xx *ag, +static inline void ag71xx_mii_ctrl_set_speed(struct ag71xx *ag, unsigned int speed) { u32 t; diff --git a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c index b8b2b03c0e..976b23a017 100644 --- a/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c +++ b/target/linux/ar71xx/files/drivers/watchdog/ar71xx_wdt.c @@ -54,19 +54,19 @@ static int wdt_timeout = WDT_TIMEOUT; static int boot_status; static int max_timeout; -static void inline ar71xx_wdt_keepalive(void) +static inline void ar71xx_wdt_keepalive(void) { ar71xx_reset_wr(AR71XX_RESET_REG_WDOG, ar71xx_ahb_freq * wdt_timeout); } -static void inline ar71xx_wdt_enable(void) +static inline void ar71xx_wdt_enable(void) { printk(KERN_DEBUG DRV_NAME ": enabling watchdog timer\n"); ar71xx_wdt_keepalive(); ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_FCR); } -static void inline ar71xx_wdt_disable(void) +static inline void ar71xx_wdt_disable(void) { printk(KERN_DEBUG DRV_NAME ": disabling watchdog timer\n"); ar71xx_reset_wr(AR71XX_RESET_REG_WDOG_CTRL, WDOG_CTRL_ACTION_NONE); -- 2.11.0