diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-08-30 18:30:38 -0400 |
| commit | 0a7d5f8ce960e74fa22986bda4af488539796e49 (patch) | |
| tree | e29ad17808a5c3410518e22dae8dfe94801b59f3 /drivers/scsi/megaraid/megaraid_ioctl.h | |
| parent | 0165508c80a2b5d5268d9c5dfa9b30c534a33693 (diff) | |
| parent | dc709bd190c130b299ac19d596594256265c042a (diff) | |
Merge branch 'master' of git://git.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; |