diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:50:24 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-01-13 13:50:24 -0500 |
| commit | 7b0cb1bdac9e941141e3790785955ed933d476f3 (patch) | |
| tree | 8652bdbe540f5552696b3b8827189eda4b2e01e4 /drivers/block/cciss.h | |
| parent | 275220f0fcff1adf28a717076e00f575edf05fda (diff) | |
| parent | e6e1ee936d61d697735d17517678a626b7701ce4 (diff) | |
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.h')
| -rw-r--r-- | drivers/block/cciss.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/block/cciss.h b/drivers/block/cciss.h index 4b8933d778f1..579f74918493 100644 --- a/drivers/block/cciss.h +++ b/drivers/block/cciss.h | |||
| @@ -103,8 +103,8 @@ struct ctlr_info | |||
| 103 | struct access_method access; | 103 | struct access_method access; |
| 104 | 104 | ||
| 105 | /* queue and queue Info */ | 105 | /* queue and queue Info */ |
| 106 | struct hlist_head reqQ; | 106 | struct list_head reqQ; |
| 107 | struct hlist_head cmpQ; | 107 | struct list_head cmpQ; |
| 108 | unsigned int Qdepth; | 108 | unsigned int Qdepth; |
| 109 | unsigned int maxQsinceinit; | 109 | unsigned int maxQsinceinit; |
| 110 | unsigned int maxSG; | 110 | unsigned int maxSG; |