diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2009-12-07 12:36:35 -0500 |
| commit | d014d043869cdc591f3a33243d3481fa4479c2d0 (patch) | |
| tree | 63626829498e647ba058a1ce06419fe7e4d5f97d /drivers/block/cciss_cmd.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
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 dbaed1ea0da3..8098fccdbec4 100644 --- a/drivers/block/cciss_cmd.h +++ b/drivers/block/cciss_cmd.h | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | //########################################################################### | 5 | //########################################################################### |
| 6 | #define CISS_VERSION "1.00" | 6 | #define CISS_VERSION "1.00" |
| 7 | 7 | ||
| 8 | //general boundary defintions | 8 | //general boundary definitions |
| 9 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations | 9 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations |
| 10 | #define MAXSGENTRIES 31 | 10 | #define MAXSGENTRIES 31 |
| 11 | #define MAXREPLYQS 256 | 11 | #define MAXREPLYQS 256 |