aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-sparc64
diff options
context:
space:
mode:
authorJan Beulich <jbeulich@novell.com>2007-10-17 02:27:33 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-17 11:42:55 -0400
commit9c6cdad7fee1630941cdd9d74ec310632a9e5c93 (patch)
tree5eb411a0c78d78cdda67465e8bc027f84d267641 /include/asm-sparc64
parent2e9c47cd4d451c57868c898672802eec9867ae1e (diff)
cleanup floppy.h
AUTO_DMA and FLOPPY_MOTOR_MASK in include/asm-*/floppy.h are dead symbols - remove them. Signed-off-by: Jan Beulich <jbeulich@novell.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r--include/asm-sparc64/floppy.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/asm-sparc64/floppy.h b/include/asm-sparc64/floppy.h
index 1783239c7b40..c47f58d6c15c 100644
--- a/include/asm-sparc64/floppy.h
+++ b/include/asm-sparc64/floppy.h
@@ -84,8 +84,6 @@ static struct sun_floppy_ops sun_fdops;
84#define fd_free_irq() sun_fdops.fd_free_irq() 84#define fd_free_irq() sun_fdops.fd_free_irq()
85#define fd_eject(drive) sun_fdops.fd_eject(drive) 85#define fd_eject(drive) sun_fdops.fd_eject(drive)
86 86
87static int FLOPPY_MOTOR_MASK = 0x10;
88
89/* Super paranoid... */ 87/* Super paranoid... */
90#undef HAVE_DISABLE_HLT 88#undef HAVE_DISABLE_HLT
91 89
@@ -622,7 +620,6 @@ isa_done:
622 sun_fdops.fd_eject = sun_pci_fd_eject; 620 sun_fdops.fd_eject = sun_pci_fd_eject;
623 621
624 fdc_status = (unsigned long) &sun_fdc->status_82077; 622 fdc_status = (unsigned long) &sun_fdc->status_82077;
625 FLOPPY_MOTOR_MASK = 0xf0;
626 623
627 allowed_drive_mask = 0; 624 allowed_drive_mask = 0;
628 sun_floppy_types[0] = 0; 625 sun_floppy_types[0] = 0;
@@ -729,7 +726,6 @@ static unsigned long __init sun_floppy_init(void)
729 sun_fdops.fd_eject = sun_pci_fd_eject; 726 sun_fdops.fd_eject = sun_pci_fd_eject;
730 727
731 fdc_status = (unsigned long) &sun_fdc->status_82077; 728 fdc_status = (unsigned long) &sun_fdc->status_82077;
732 FLOPPY_MOTOR_MASK = 0xf0;
733 729
734 /* 730 /*
735 * XXX: Find out on which machines this is really needed. 731 * XXX: Find out on which machines this is really needed.