diff options
author | Adrian Bunk <bunk@kernel.org> | 2008-10-13 15:58:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-14 13:23:27 -0400 |
commit | 29c8a24672e1cdfee99c15b870c57eb30ae69daf (patch) | |
tree | 26f67aaca31d878339a99d89e0036d912bdef449 /arch/m68k/kernel | |
parent | 7477fb6fbc339469ea945e007f3f7b3bb13b25f7 (diff) |
m68k: Remove the broken Hades support
This patch removes the Hades support that was marked as BROKEN 5 years ago.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m68k/kernel')
-rw-r--r-- | arch/m68k/kernel/bios32.c | 6 | ||||
-rw-r--r-- | arch/m68k/kernel/process.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/arch/m68k/kernel/bios32.c b/arch/m68k/kernel/bios32.c index af170c2be735..1c3b752f5608 100644 --- a/arch/m68k/kernel/bios32.c +++ b/arch/m68k/kernel/bios32.c | |||
@@ -476,10 +476,12 @@ void __init pcibios_init(void) | |||
476 | printk("Linux/m68k PCI BIOS32 revision %x.%02x\n", MAJOR_REV, MINOR_REV); | 476 | printk("Linux/m68k PCI BIOS32 revision %x.%02x\n", MAJOR_REV, MINOR_REV); |
477 | 477 | ||
478 | bus_info = NULL; | 478 | bus_info = NULL; |
479 | #ifdef CONFIG_HADES | 479 | |
480 | /* Hades code was: | ||
480 | if (MACH_IS_HADES) | 481 | if (MACH_IS_HADES) |
481 | bus_info = init_hades_pci(); | 482 | bus_info = init_hades_pci(); |
482 | #endif | 483 | */ |
484 | |||
483 | if (bus_info != NULL) | 485 | if (bus_info != NULL) |
484 | { | 486 | { |
485 | printk("PCI: Probing PCI hardware\n"); | 487 | printk("PCI: Probing PCI hardware\n"); |
diff --git a/arch/m68k/kernel/process.c b/arch/m68k/kernel/process.c index 7888cdf91f5d..3042c2bc8c58 100644 --- a/arch/m68k/kernel/process.c +++ b/arch/m68k/kernel/process.c | |||
@@ -78,7 +78,7 @@ unsigned long thread_saved_pc(struct task_struct *tsk) | |||
78 | static void default_idle(void) | 78 | static void default_idle(void) |
79 | { | 79 | { |
80 | if (!need_resched()) | 80 | if (!need_resched()) |
81 | #if defined(MACH_ATARI_ONLY) && !defined(CONFIG_HADES) | 81 | #if defined(MACH_ATARI_ONLY) |
82 | /* block out HSYNC on the atari (falcon) */ | 82 | /* block out HSYNC on the atari (falcon) */ |
83 | __asm__("stop #0x2200" : : : "cc"); | 83 | __asm__("stop #0x2200" : : : "cc"); |
84 | #else | 84 | #else |