Patch: minor cleanup to floppy.c (3/3)
Alan,
Here's the final part of the cleanup - we remove the useless FDC2 declarations from the various architecture header files, as well as some speeling mistaks. 8)
It depends on the first patch being applied.
include/asm-m68k/floppy.h +0 -2
@@ -36,8 +36,6 @@/* basically PC init + set use_virtual_dma */ #define FDC1 m68k_floppy_init() -static int FDC2 =-1 ; -#define N_FDC 1#define N_DRIVE 8
include/asm-mips/floppy.h +0 -8
@@ -79,14 +79,6 @@#define FDC1 fd_ops->fd_getfdaddr1(); -/* -* Hack: The floppy drivrer defines this, before including fdreg.h. We use -* to define FDC2 only one and keep it a static variable in floppy.c. -*/ -#ifdef FDPATCHES -static int FDC2 =-1 ; -#endif -#define N_FDC 1/* do you *really* want a second controller? */ #define N_DRIVE 8
include/asm-mips64/floppy.h +0 -8
@@ -77,14 +77,6 @@#define FDC1 fd_ops->fd_getfdaddr1(); -/* -* Hack: The floppy drivrer defines this, before including fdreg.h. We use -* to define FDC2 only one and keep it a static variable in floppy.c. -*/ -#ifdef FDPATCHES -static int FDC2 =-1 ; -#endif -#define N_FDC 1/* do you *really* want a second controller? */ #define N_DRIVE 8
include/asm-sparc/floppy.h +0 -2
@@ -96,8 +96,6 @@*/ #define FDC1 sun_floppy_init() -static int FDC2 =-1 ; -#define N_FDC 1#define N_DRIVE 8
include/asm-sparc64/floppy.h +0 -1
@@ -104,7 +104,6 @@#define FLOPPY1_TYPE sun_floppy_types[1]#define FDC1 ((unsigned long)sun_fdc) -static int FDC2 =-1 ;#define N_FDC 1#define N_DRIVE 8
--
Russell King ([email protected]) The developer of ARM Linux
http://www.arm.linux.org.uk/personal/aboutme.html