diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/block/ataflop.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/block/ataflop.c')
| -rw-r--r-- | drivers/block/ataflop.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index a5af1d6dda8b..e35cf59cbfde 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c | |||
| @@ -1470,8 +1470,6 @@ repeat: | |||
| 1470 | 1470 | ||
| 1471 | void do_fd_request(struct request_queue * q) | 1471 | void do_fd_request(struct request_queue * q) |
| 1472 | { | 1472 | { |
| 1473 | unsigned long flags; | ||
| 1474 | |||
| 1475 | DPRINT(("do_fd_request for pid %d\n",current->pid)); | 1473 | DPRINT(("do_fd_request for pid %d\n",current->pid)); |
| 1476 | while( fdc_busy ) sleep_on( &fdc_wait ); | 1474 | while( fdc_busy ) sleep_on( &fdc_wait ); |
| 1477 | fdc_busy = 1; | 1475 | fdc_busy = 1; |