1 files changed, 12 insertions, 25 deletions

diff --git a/arch/m68k/atari/config.c b/arch/m68k/atari/config.c
index 5945e1505558..af031855f796 100644
--- a/arch/m68k/atari/config.c
+++ b/arch/m68k/atari/config.c
@@ -231,7 +231,7 @@ void __init config_atari(void)
          */
 
         printk("Atari hardware found: ");
-        if (MACH_IS_MEDUSA || MACH_IS_HADES) {
+        if (MACH_IS_MEDUSA) {
                 /* There's no Atari video hardware on the Medusa, but all the
                  * addresses below generate a DTACK so no bus error occurs! */
         } else if (hwreg_present(f030_xreg)) {
@@ -269,10 +269,6 @@ void __init config_atari(void)
                 ATARIHW_SET(SCSI_DMA);
                 printk("TT_SCSI_DMA ");
         }
-        if (!MACH_IS_HADES && hwreg_present(&st_dma.dma_hi)) {
-                ATARIHW_SET(STND_DMA);
-                printk("STND_DMA ");
-        }
         /*
          * The ST-DMA address registers aren't readable
          * on all Medusas, so the test below may fail
@@ -294,12 +290,11 @@ void __init config_atari(void)
                 ATARIHW_SET(YM_2149);
                 printk("YM2149 ");
         }
-        if (!MACH_IS_MEDUSA && !MACH_IS_HADES &&
-                hwreg_present(&tt_dmasnd.ctrl)) {
+        if (!MACH_IS_MEDUSA && hwreg_present(&tt_dmasnd.ctrl)) {
                 ATARIHW_SET(PCM_8BIT);
                 printk("PCM ");
         }
-        if (!MACH_IS_HADES && hwreg_present(&falcon_codec.unused5)) {
+        if (hwreg_present(&falcon_codec.unused5)) {
                 ATARIHW_SET(CODEC);
                 printk("CODEC ");
         }
@@ -313,7 +308,7 @@ void __init config_atari(void)
             (tt_scc_dma.dma_ctrl = 0x01, (tt_scc_dma.dma_ctrl & 1) == 1) &&
             (tt_scc_dma.dma_ctrl = 0x00, (tt_scc_dma.dma_ctrl & 1) == 0)
 #else
-            !MACH_IS_MEDUSA && !MACH_IS_HADES
+            !MACH_IS_MEDUSA
 #endif
             ) {
                 ATARIHW_SET(SCC_DMA);
@@ -327,10 +322,7 @@ void __init config_atari(void)
                 ATARIHW_SET(ST_ESCC);
                 printk("ST_ESCC ");
         }
-        if (MACH_IS_HADES) {
-                ATARIHW_SET(VME);
-                printk("VME ");
-        } else if (hwreg_present(&tt_scu.sys_mask)) {
+        if (hwreg_present(&tt_scu.sys_mask)) {
                 ATARIHW_SET(SCU);
                 /* Assume a VME bus if there's a SCU */
                 ATARIHW_SET(VME);
@@ -340,7 +332,7 @@ void __init config_atari(void)
                 ATARIHW_SET(ANALOG_JOY);
                 printk("ANALOG_JOY ");
         }
-        if (!MACH_IS_HADES && hwreg_present(blitter.halftone)) {
+        if (hwreg_present(blitter.halftone)) {
                 ATARIHW_SET(BLITTER);
                 printk("BLITTER ");
         }
@@ -349,8 +341,7 @@ void __init config_atari(void)
                 printk("IDE ");
         }
 #if 1 /* This maybe wrong */
-        if (!MACH_IS_MEDUSA && !MACH_IS_HADES &&
-            hwreg_present(&tt_microwire.data) &&
+        if (!MACH_IS_MEDUSA && hwreg_present(&tt_microwire.data) &&
             hwreg_present(&tt_microwire.mask) &&
             (tt_microwire.mask = 0x7ff,
              udelay(1),
@@ -369,19 +360,18 @@ void __init config_atari(void)
                 mach_hwclk = atari_tt_hwclk;
                 mach_set_clock_mmss = atari_tt_set_clock_mmss;
         }
-        if (!MACH_IS_HADES && hwreg_present(&mste_rtc.sec_ones)) {
+        if (hwreg_present(&mste_rtc.sec_ones)) {
                 ATARIHW_SET(MSTE_CLK);
                 printk("MSTE_CLK ");
                 mach_hwclk = atari_mste_hwclk;
                 mach_set_clock_mmss = atari_mste_set_clock_mmss;
         }
-        if (!MACH_IS_MEDUSA && !MACH_IS_HADES &&
-            hwreg_present(&dma_wd.fdc_speed) &&
+        if (!MACH_IS_MEDUSA && hwreg_present(&dma_wd.fdc_speed) &&
             hwreg_write(&dma_wd.fdc_speed, 0)) {
                 ATARIHW_SET(FDCSPEED);
                 printk("FDC_SPEED ");
         }
-        if (!MACH_IS_HADES && !ATARIHW_PRESENT(ST_SCSI)) {
+        if (!ATARIHW_PRESENT(ST_SCSI)) {
                 ATARIHW_SET(ACSI);
                 printk("ACSI ");
         }
@@ -449,7 +439,7 @@ void __init config_atari(void)
          * 0xFFxxxxxx -> 0x00xxxxxx, so that the first 16MB is accessible
          * in the last 16MB of the address space.
          */
-        tos_version = (MACH_IS_MEDUSA || MACH_IS_HADES) ?
+        tos_version = (MACH_IS_MEDUSA) ?
                         0xfff : *(unsigned short *)0xff000002;
         atari_rtc_year_offset = (tos_version < 0x306) ? 70 : 68;
 }
@@ -511,8 +501,7 @@ static void atari_reset(void)
          * On the Medusa, phys. 0x4 may contain garbage because it's no
          * ROM.  See above for explanation why we cannot use PTOV(4).
          */
-        reset_addr = MACH_IS_HADES ? 0x7fe00030 :
-                     MACH_IS_MEDUSA || MACH_IS_AB40 ? 0xe00030 :
+        reset_addr = MACH_IS_MEDUSA || MACH_IS_AB40 ? 0xe00030 :
                      *(unsigned long *) 0xff000004;
 
         /* reset ACIA for switch off OverScan, if it's active */
@@ -606,8 +595,6 @@ static void atari_get_model(char *model)
                 if (MACH_IS_MEDUSA)
                         /* Medusa has TT _MCH cookie */
                         strcat(model, "Medusa");
-                else if (MACH_IS_HADES)
-                        strcat(model, "Hades");
                 else
                         strcat(model, "TT");
                 break;