diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-07-19 12:54:28 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-07-19 12:54:28 -0400 |
| commit | 876fbb5d3ebab01685fef3839d245481c30eab5f (patch) | |
| tree | 83c02fbdc91f052ce01ae31e6c0d5ebae8deed07 /include | |
| parent | ecb2cf1a6b63825a258ff4fe0d7f3070fbe4676b (diff) | |
| parent | 64b6f46f1141ad938e354f37af62e28da972e8eb (diff) | |
| download | linux-876fbb5d3ebab01685fef3839d245481c30eab5f.tar.gz linux-876fbb5d3ebab01685fef3839d245481c30eab5f.tar.bz2 linux-876fbb5d3ebab01685fef3839d245481c30eab5f.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless into for-davem
Diffstat (limited to 'include')
| -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 \ |