diff options
| author | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor@insightbb.com> | 2006-09-19 01:56:44 -0400 |
| commit | 0612ec48762bf8712db1925b2e67246d2237ebab (patch) | |
| tree | 01b0d69c9c9915015c0f23ad4263646dd5413e99 /drivers/scsi/megaraid/megaraid_ioctl.h | |
| parent | 4263cf0fac28122c8381b6f4f9441a43cd93c81f (diff) | |
| parent | 47a5c6fa0e204a2b63309c648bb2fde36836c826 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_ioctl.h')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_ioctl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/scsi/megaraid/megaraid_ioctl.h b/drivers/scsi/megaraid/megaraid_ioctl.h index bdaee144a1c3..b8aa34202ec3 100644 --- a/drivers/scsi/megaraid/megaraid_ioctl.h +++ b/drivers/scsi/megaraid/megaraid_ioctl.h | |||
| @@ -132,6 +132,10 @@ typedef struct uioc { | |||
| 132 | /* Driver Data: */ | 132 | /* Driver Data: */ |
| 133 | void __user * user_data; | 133 | void __user * user_data; |
| 134 | uint32_t user_data_len; | 134 | uint32_t user_data_len; |
| 135 | |||
| 136 | /* 64bit alignment */ | ||
| 137 | uint32_t pad_for_64bit_align; | ||
| 138 | |||
| 135 | mraid_passthru_t __user *user_pthru; | 139 | mraid_passthru_t __user *user_pthru; |
| 136 | 140 | ||
| 137 | mraid_passthru_t *pthru32; | 141 | mraid_passthru_t *pthru32; |