diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /arch/powerpc/xmon/xmon.c | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
Diffstat (limited to 'arch/powerpc/xmon/xmon.c')
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index 28fdf4f50c27..669e6566ad70 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c | |||
| @@ -2634,7 +2634,7 @@ static int __init setup_xmon_sysrq(void) | |||
| 2634 | __initcall(setup_xmon_sysrq); | 2634 | __initcall(setup_xmon_sysrq); |
| 2635 | #endif /* CONFIG_MAGIC_SYSRQ */ | 2635 | #endif /* CONFIG_MAGIC_SYSRQ */ |
| 2636 | 2636 | ||
| 2637 | int __initdata xmon_early, xmon_off; | 2637 | static int __initdata xmon_early, xmon_off; |
| 2638 | 2638 | ||
| 2639 | static int __init early_parse_xmon(char *p) | 2639 | static int __init early_parse_xmon(char *p) |
| 2640 | { | 2640 | { |