diff options
author | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 12:23:57 +0200 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2007-08-01 12:23:57 +0200 |
commit | 440fdb53b4ae58602711b5b8c3a139ace2404dbb (patch) | |
tree | c6fb88d6ad537ec53aeecadc75a61ab6147d4c9c /drivers/block/ataflop.c | |
parent | [MTD] [NAND] nand_base.c fix broken link (diff) | |
parent | Fix WARN_ON() on bitfield ops (diff) | |
download | linux-440fdb53b4ae58602711b5b8c3a139ace2404dbb.tar.xz linux-440fdb53b4ae58602711b5b8c3a139ace2404dbb.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block/ataflop.c')
-rw-r--r-- | drivers/block/ataflop.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/ataflop.c b/drivers/block/ataflop.c index 14d6b9492750..94268c75d04f 100644 --- a/drivers/block/ataflop.c +++ b/drivers/block/ataflop.c @@ -1466,7 +1466,7 @@ repeat: } -void do_fd_request(request_queue_t * q) +void do_fd_request(struct request_queue * q) { unsigned long flags; |