diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-01 14:55:13 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2010-07-01 14:55:13 +1000 |
| commit | ed5b50917d332d7a4fdbbc6a3085ff421b9d337c (patch) | |
| tree | cee9c693bf41dbaf44287a540690f2c459f5a27b /drivers/staging/vt6656/int.h | |
| parent | 55c678bd0631008a9ad64dd2c6c9e634515eee2a (diff) | |
| parent | 12513b76a021e5b41a9d5d5981da75dfd6480890 (diff) | |
Merge remote branch 'staging-next/staging-next'
Conflicts:
drivers/staging/batman-adv/bat_sysfs.c
drivers/staging/batman-adv/device.c
Diffstat (limited to 'drivers/staging/vt6656/int.h')
| -rw-r--r-- | drivers/staging/vt6656/int.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/staging/vt6656/int.h b/drivers/staging/vt6656/int.h index cdf355130de7..d32ba351bc45 100644 --- a/drivers/staging/vt6656/int.h +++ b/drivers/staging/vt6656/int.h @@ -57,7 +57,7 @@ typedef struct tagSINTData { BYTE byACKFail; BYTE byFCSErr; BYTE abySW[2]; -}__attribute__ ((__packed__)) +} __attribute__ ((__packed__)) SINTData, *PSINTData; |