diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-10-05 21:03:43 -0400 |
| commit | 4ad99f15c6a3cadf36928c399459ea4fdb3d49f9 (patch) | |
| tree | d0536e4da737900fa27b235f175a3d179d692200 /drivers/block/floppy.c | |
| parent | 46767aeba58ca9357a2309765201bad38d8f5e9b (diff) | |
| parent | 44aefd2706bb6f5b65ba2c38cd89e7609e2b43d3 (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 629c5769d994..9e6d3a87cbe3 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -221,7 +221,7 @@ static DEFINE_SPINLOCK(floppy_lock); | |||
| 221 | static struct completion device_release; | 221 | static struct completion device_release; |
| 222 | 222 | ||
| 223 | static unsigned short virtual_dma_port = 0x3f0; | 223 | static unsigned short virtual_dma_port = 0x3f0; |
| 224 | irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs); | 224 | irqreturn_t floppy_interrupt(int irq, void *dev_id); |
| 225 | static int set_dor(int fdc, char mask, char data); | 225 | static int set_dor(int fdc, char mask, char data); |
| 226 | 226 | ||
| 227 | #define K_64 0x10000 /* 64KB */ | 227 | #define K_64 0x10000 /* 64KB */ |
| @@ -1726,7 +1726,7 @@ static void print_result(char *message, int inr) | |||
| 1726 | } | 1726 | } |
| 1727 | 1727 | ||
| 1728 | /* interrupt handler. Note that this can be called externally on the Sparc */ | 1728 | /* interrupt handler. Note that this can be called externally on the Sparc */ |
| 1729 | irqreturn_t floppy_interrupt(int irq, void *dev_id, struct pt_regs *regs) | 1729 | irqreturn_t floppy_interrupt(int irq, void *dev_id) |
| 1730 | { | 1730 | { |
| 1731 | void (*handler) (void) = do_floppy; | 1731 | void (*handler) (void) = do_floppy; |
| 1732 | int do_print; | 1732 | int do_print; |