diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 22:26:28 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 22:26:28 -0500 |
| commit | 239a14a340ad4a81cfff4075625382d7f78f5258 (patch) | |
| tree | 61c9e195a7c2ab7a189eb511f9c675bb52f006ad /include | |
| parent | f60e8ccbfce6b40a112bddef5b4926b7416b4f92 (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
Merge commit 'v2.6.38-rc6' into linaro-2.6.38
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/module.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 9bdf27c7615..5de42043dff 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -62,7 +62,7 @@ struct module_version_attribute { struct module_attribute mattr; const char *module_name; const char *version; -}; +} __attribute__ ((__aligned__(sizeof(void *)))); struct module_kobject { |