diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:31:36 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-26 18:31:36 -0700 |
| commit | bf0cbb3e4264e9d6493af757f63d4b0527d21eab (patch) | |
| tree | 61903263aa73f98d0d6d7fbc77013080b0eb8856 /include/linux/mod_devicetable.h | |
| parent | 0b1556945475e8529328edf98ff0d201ed133edb (diff) | |
| parent | 4fb7edce52e5b6cf41e3375822d74a27f0b6f2dd (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
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 47da39ba3f03..4ed2107bc020 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -209,10 +209,11 @@ struct pcmcia_device_id { /* for real multi-function devices */ __u8 function; - /* for pseude multi-function devices */ + /* for pseudo multi-function devices */ __u8 device_no; - __u32 prod_id_hash[4]; + __u32 prod_id_hash[4] + __attribute__((aligned(sizeof(__u32)))); /* not matched against in kernelspace*/ #ifdef __KERNEL__ |