diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-08-29 16:17:25 -0400 |
| commit | e4ac2663ea27d5dda88d97d117080995fcfcd6d5 (patch) | |
| tree | 74eac23956a86546ed93eac973b0bc4744b97ccc /drivers/scsi/megaraid/megaraid_ioctl.h | |
| parent | 4c2be501b7e8695f8bdf4f7d5f51595ed55eea44 (diff) | |
| parent | d96299537e43681942ea272e00b0e529aa5b5fa4 (diff) | |
Merge branch 'from-linus' into upstream
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; |