Building booke_wdt fails when trying to build as a module as there is no early_param() in module. Fix by enclosing within MODULE check.
Also remove notrace attribute as it is implicit in the __init attribute. Signed-off-by: Pranith Kumar <[email protected]> --- drivers/watchdog/booke_wdt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/booke_wdt.c b/drivers/watchdog/booke_wdt.c index 08a7853..8a26b54 100644 --- a/drivers/watchdog/booke_wdt.c +++ b/drivers/watchdog/booke_wdt.c @@ -41,8 +41,9 @@ u32 booke_wdt_period = CONFIG_BOOKE_WDT_DEFAULT_TIMEOUT; #define WDTP_MASK (TCR_WP_MASK) #endif +#ifndef MODULE /* Checks wdt=x and wdt_period=xx command-line option */ -notrace int __init early_parse_wdt(char *p) +int __init early_parse_wdt(char *p) { if (p && strncmp(p, "0", 1) != 0) booke_wdt_enabled = 1; @@ -63,6 +64,8 @@ int __init early_parse_wdt_period(char *p) } early_param("wdt_period", early_parse_wdt_period); +#endif /* #ifndef MODULE */ + #ifdef CONFIG_PPC_FSL_BOOK3E /* For the specified period, determine the number of seconds -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
