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 /include/linux/cciss_ioctl.h | |
| parent | 6ec22f9b037fc0c2e00ddb7023fad279c365324d (diff) | |
| parent | 6070d81eb5f2d4943223c96e7609a53cdc984364 (diff) | |
Merge branch 'for-next' into for-linus
Conflicts:
kernel/irq/chip.c
Diffstat (limited to 'include/linux/cciss_ioctl.h')
| -rw-r--r-- | include/linux/cciss_ioctl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/cciss_ioctl.h b/include/linux/cciss_ioctl.h index cb57c30081a8..eb130b4d8e72 100644 --- a/include/linux/cciss_ioctl.h +++ b/include/linux/cciss_ioctl.h | |||
| @@ -39,7 +39,7 @@ typedef __u32 DriverVer_type; | |||
| 39 | #ifndef CCISS_CMD_H | 39 | #ifndef CCISS_CMD_H |
| 40 | // This defines are duplicated in cciss_cmd.h in the driver directory | 40 | // This defines are duplicated in cciss_cmd.h in the driver directory |
| 41 | 41 | ||
| 42 | //general boundary defintions | 42 | //general boundary definitions |
| 43 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations | 43 | #define SENSEINFOBYTES 32//note that this value may vary between host implementations |
| 44 | 44 | ||
| 45 | //Command Status value | 45 | //Command Status value |