diff options
| -rw-r--r-- | arch/m68k/kernel/traps.c | 2 | ||||
| -rw-r--r-- | arch/m68k/mac/config.c | 10 | ||||
| -rw-r--r-- | arch/m68k/q40/config.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/arch/m68k/kernel/traps.c b/arch/m68k/kernel/traps.c index aacd6d17b833..ada4f4cca811 100644 --- a/arch/m68k/kernel/traps.c +++ b/arch/m68k/kernel/traps.c | |||
| @@ -455,7 +455,7 @@ static inline void access_error040(struct frame *fp) | |||
| 455 | 455 | ||
| 456 | if (do_page_fault(&fp->ptregs, addr, errorcode)) { | 456 | if (do_page_fault(&fp->ptregs, addr, errorcode)) { |
| 457 | #ifdef DEBUG | 457 | #ifdef DEBUG |
| 458 | printk("do_page_fault() !=0 \n"); | 458 | printk("do_page_fault() !=0\n"); |
| 459 | #endif | 459 | #endif |
| 460 | if (user_mode(&fp->ptregs)){ | 460 | if (user_mode(&fp->ptregs)){ |
| 461 | /* delay writebacks after signal delivery */ | 461 | /* delay writebacks after signal delivery */ |
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c index 0356da9bf763..1c16b1baf8db 100644 --- a/arch/m68k/mac/config.c +++ b/arch/m68k/mac/config.c | |||
| @@ -148,7 +148,7 @@ static void mac_cache_card_flush(int writeback) | |||
| 148 | void __init config_mac(void) | 148 | void __init config_mac(void) |
| 149 | { | 149 | { |
| 150 | if (!MACH_IS_MAC) | 150 | if (!MACH_IS_MAC) |
| 151 | printk(KERN_ERR "ERROR: no Mac, but config_mac() called!! \n"); | 151 | printk(KERN_ERR "ERROR: no Mac, but config_mac() called!!\n"); |
| 152 | 152 | ||
| 153 | mach_sched_init = mac_sched_init; | 153 | mach_sched_init = mac_sched_init; |
| 154 | mach_init_IRQ = mac_init_IRQ; | 154 | mach_init_IRQ = mac_init_IRQ; |
| @@ -867,7 +867,7 @@ static void __init mac_identify(void) | |||
| 867 | */ | 867 | */ |
| 868 | iop_preinit(); | 868 | iop_preinit(); |
| 869 | 869 | ||
| 870 | printk(KERN_INFO "Detected Macintosh model: %d \n", model); | 870 | printk(KERN_INFO "Detected Macintosh model: %d\n", model); |
| 871 | 871 | ||
| 872 | /* | 872 | /* |
| 873 | * Report booter data: | 873 | * Report booter data: |
| @@ -878,12 +878,12 @@ static void __init mac_identify(void) | |||
| 878 | mac_bi_data.videoaddr, mac_bi_data.videorow, | 878 | mac_bi_data.videoaddr, mac_bi_data.videorow, |
| 879 | mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF, | 879 | mac_bi_data.videodepth, mac_bi_data.dimensions & 0xFFFF, |
| 880 | mac_bi_data.dimensions >> 16); | 880 | mac_bi_data.dimensions >> 16); |
| 881 | printk(KERN_DEBUG " Videological 0x%lx phys. 0x%lx, SCC at 0x%lx \n", | 881 | printk(KERN_DEBUG " Videological 0x%lx phys. 0x%lx, SCC at 0x%lx\n", |
| 882 | mac_bi_data.videological, mac_orig_videoaddr, | 882 | mac_bi_data.videological, mac_orig_videoaddr, |
| 883 | mac_bi_data.sccbase); | 883 | mac_bi_data.sccbase); |
| 884 | printk(KERN_DEBUG " Boottime: 0x%lx GMTBias: 0x%lx \n", | 884 | printk(KERN_DEBUG " Boottime: 0x%lx GMTBias: 0x%lx\n", |
| 885 | mac_bi_data.boottime, mac_bi_data.gmtbias); | 885 | mac_bi_data.boottime, mac_bi_data.gmtbias); |
| 886 | printk(KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx \n", | 886 | printk(KERN_DEBUG " Machine ID: %ld CPUid: 0x%lx memory size: 0x%lx\n", |
| 887 | mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize); | 887 | mac_bi_data.id, mac_bi_data.cpuid, mac_bi_data.memsize); |
| 888 | 888 | ||
| 889 | iop_init(); | 889 | iop_init(); |
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) |
