diff options
| author | Mark Brown <broonie@linaro.org> | 2013-08-09 17:26:31 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-08-09 17:26:31 +0100 |
| commit | c7abc19ca6d48392f91ca04ebe1e9813b3ace435 (patch) | |
| tree | c23540ea1425e9891b39cdff550e90caaba38163 /include/linux/mod_devicetable.h | |
| parent | d60990d597bfa2816dfe28a5c5c6787610b423e6 (diff) | |
| parent | c095ba7224d8edc71dcef0d655911399a8bd4a3f (diff) | |
Merge tag 'v3.11-rc4' into spi-bitbang
Linux 3.11-rc4
Diffstat (limited to 'include/linux/mod_devicetable.h')
| -rw-r--r-- | include/linux/mod_devicetable.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index b62d4af6c667..45e921401b06 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -361,7 +361,8 @@ struct ssb_device_id { __u16 vendor; __u16 coreid; __u8 revision; -}; + __u8 __pad; +} __attribute__((packed, aligned(2))); #define SSB_DEVICE(_vendor, _coreid, _revision) \ { .vendor = _vendor, .coreid = _coreid, .revision = _revision, } #define SSB_DEVTABLE_END \ @@ -377,7 +378,7 @@ struct bcma_device_id { __u16 id; __u8 rev; __u8 class; -}; +} __attribute__((packed,aligned(2))); #define BCMA_CORE(_manuf, _id, _rev, _class) \ { .manuf = _manuf, .id = _id, .rev = _rev, .class = _class, } #define BCMA_CORETABLE_END \ |