diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-07-25 16:48:01 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-07-25 16:48:01 -0400 |
commit | 9d55911e8f14fad6d6fc95bf6db7af5af2d808c6 (patch) | |
tree | 4c59f917d2e3c3cfa62c2a3ce77c1c2be04f708e /include/linux | |
parent | bgmac: make bgmac depend on bcm47xx (diff) | |
parent | brcmfmac: bail out of brcmf_txflowblock_if() for non-netdev interface (diff) | |
download | linux-dev-9d55911e8f14fad6d6fc95bf6db7af5af2d808c6.tar.xz linux-dev-9d55911e8f14fad6d6fc95bf6db7af5af2d808c6.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
Diffstat (limited to 'include/linux')
-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 \ |