NBD: allow hung network I/O to be cancelled

[linux-2.6-omap-h63xx.git] / include / asm-x86 / floppy_64.h

diff --git a/include/asm-x86/floppy_64.h b/include/asm-x86/floppy_64.h
index 6ea13c3806f3c70ae922731ac14c47375099d15e..d993380dcb47f9102534e6e71e79aacf01c0b648 100644 (file)
--- a/include/asm-x86/floppy_64.h
+++ b/include/asm-x86/floppy_64.h
@@ -274,10 +274,6 @@ static int FDC2 = -1;
 #define N_FDC 2
 #define N_DRIVE 8
 
-#define FLOPPY_MOTOR_MASK 0xf0
-
-#define AUTO_DMA
-
 #define EXTRA_FLOPPY_PARAMS
 
 #endif /* __ASM_X86_64_FLOPPY_H */