diff options
| author | David S. Miller <davem@davemloft.net> | 2012-05-11 20:45:18 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-05-11 20:45:18 -0700 |
| commit | 58fa4dcbc419c4d381ed7ccfe6e9e747aaf88aeb (patch) | |
| tree | adff21c6412cc83f90019160abb4b2beea233712 /arch/sparc/include/asm/floppy_32.h | |
| parent | 8695c37d06721c581385725eb80ba4e6d6bdf73f (diff) | |
| download | talos-obmc-linux-58fa4dcbc419c4d381ed7ccfe6e9e747aaf88aeb.tar.gz talos-obmc-linux-58fa4dcbc419c4d381ed7ccfe6e9e747aaf88aeb.zip | |
sparc: Clear out unused asm/machines.h values.
Remove sun4 and sun4c machine ID values from asm/machines.h
Also kill NUM_SUN_MACHINES, use ARRAY_SIZE instead.
Kill asm/machines.h include and sun4c checks from asm/floppy_32.h
Remove asm/machines.h include from setup_32.c and time_32.c, unused.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/include/asm/floppy_32.h')
| -rw-r--r-- | arch/sparc/include/asm/floppy_32.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/sparc/include/asm/floppy_32.h b/arch/sparc/include/asm/floppy_32.h index 698d9559fead..80382abd1cc5 100644 --- a/arch/sparc/include/asm/floppy_32.h +++ b/arch/sparc/include/asm/floppy_32.h @@ -12,7 +12,6 @@ #include <asm/page.h> #include <asm/pgtable.h> #include <asm/idprom.h> -#include <asm/machines.h> #include <asm/oplib.h> #include <asm/auxio.h> #include <asm/irq.h> @@ -311,9 +310,7 @@ static int sun_floppy_init(void) /* Forget it if we aren't on a machine that could possibly * ever have a floppy drive. */ - if((sparc_cpu_model != sun4c && sparc_cpu_model != sun4m) || - ((idprom->id_machtype == (SM_SUN4C | SM_4C_SLC)) || - (idprom->id_machtype == (SM_SUN4C | SM_4C_ELC)))) { + if (sparc_cpu_model != sun4m) { /* We certainly don't have a floppy controller. */ goto no_sun_fdc; } |
