diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 21:50:24 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 21:50:24 +0300 |
commit | 7b0cb1bdac9e941141e3790785955ed933d476f3 (patch) | |
tree | 8652bdbe540f5552696b3b8827189eda4b2e01e4 /drivers/block/cciss_cmd.h | |
parent | 275220f0fcff1adf28a717076e00f575edf05fda (diff) | |
parent | e6e1ee936d61d697735d17517678a626b7701ce4 (diff) | |
download | linux-7b0cb1bdac9e941141e3790785955ed933d476f3.tar.xz |
Merge branch 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block
* 'for-2.6.38/drivers' of git://git.kernel.dk/linux-2.6-block:
cciss: reinstate proper FIFO order of command queue list
floppy: replace NO_GEOM macro with a function
Diffstat (limited to 'drivers/block/cciss_cmd.h')
-rw-r--r-- | drivers/block/cciss_cmd.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/cciss_cmd.h b/drivers/block/cciss_cmd.h index eb060f1b00b6..35463d2f0ee7 100644 --- a/drivers/block/cciss_cmd.h +++ b/drivers/block/cciss_cmd.h @@ -195,7 +195,7 @@ typedef struct _CommandList_struct { int ctlr; int cmd_type; long cmdindex; - struct hlist_node list; + struct list_head list; struct request * rq; struct completion *waiting; int retry_count; |