diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-23 02:55:20 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2012-04-23 02:55:20 +0200 |
| commit | aec49c7c0e9d2abe88a3d7bc700fca66f05fd67d (patch) | |
| tree | aac7ff987592f8040ce68d5a28ece5fa4cb0fc50 /arch/powerpc/kernel | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo... (diff) | |
| parent | powerpc/mpc85xx: add MPIC message dts node (diff) | |
| download | linux-aec49c7c0e9d2abe88a3d7bc700fca66f05fd67d.tar.xz linux-aec49c7c0e9d2abe88a3d7bc700fca66f05fd67d.zip | |
Merge remote-tracking branch 'kumar/merge' into merge
Diffstat (limited to 'arch/powerpc/kernel')
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 9825f29d1faf..ec8a53fa9e8f 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -150,6 +150,9 @@ notrace void __init machine_init(u64 dt_ptr) } #ifdef CONFIG_BOOKE_WDT +extern u32 booke_wdt_enabled; +extern u32 booke_wdt_period; + /* Checks wdt=x and wdt_period=xx command-line option */ notrace int __init early_parse_wdt(char *p) { |