Merge branch 'master' into for-linus

[pandora-kernel.git] / drivers / block / ataflop.c

diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c
index a5af1d6..e35cf59 100644 (file)
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
@@ -1470,8 +1470,6 @@ repeat:
 
 void do_fd_request(struct request_queue * q)
 {
-       unsigned long flags;
-
        DPRINT(("do_fd_request for pid %d\n",current->pid));
        while( fdc_busy ) sleep_on( &fdc_wait );
        fdc_busy = 1;