diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 07:59:13 -0400 |
| commit | 772320e84588dcbe1600ffb83e5f328f2209ac2a (patch) | |
| tree | a7de21b79340aeaa17c58126f6b801b82c77b53a /arch/m68k/q40/config.c | |
| parent | 1ce53adf13a54375d2a5c7cdbe341b2558389615 (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kbuild
Conflicts:
arch/powerpc/Makefile
Diffstat (limited to 'arch/m68k/q40/config.c')
| -rw-r--r-- | arch/m68k/q40/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c index 31ab3f08bbda..ad10fecec2fe 100644 --- a/arch/m68k/q40/config.c +++ b/arch/m68k/q40/config.c | |||
| @@ -126,7 +126,7 @@ static void q40_reset(void) | |||
| 126 | { | 126 | { |
| 127 | halted = 1; | 127 | halted = 1; |
| 128 | printk("\n\n*******************************************\n" | 128 | printk("\n\n*******************************************\n" |
| 129 | "Called q40_reset : press the RESET button!! \n" | 129 | "Called q40_reset : press the RESET button!!\n" |
| 130 | "*******************************************\n"); | 130 | "*******************************************\n"); |
| 131 | Q40_LED_ON(); | 131 | Q40_LED_ON(); |
| 132 | while (1) | 132 | while (1) |