diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-09 04:38:55 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-09 04:38:59 -0500 |
| commit | c8b44163b754612fc4769fe1c5df00e98fc9d3c6 (patch) | |
| tree | 77706ff1f2a72ed294885b6cf0a7c0de0f92d6df /include/linux/module.h | |
| parent | ac23f25355ef53f3d14352fcff3c6817527a9749 (diff) | |
| parent | a5abba989deceb731047425812d268daf7536575 (diff) | |
Merge commit 'v2.6.38-rc8' into x86/asm
Merge reason: Update with the latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/module.h')
| -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 9bdf27c7615b..5de42043dff0 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -62,7 +62,7 @@ struct module_version_attribute { | |||
| 62 | struct module_attribute mattr; | 62 | struct module_attribute mattr; |
| 63 | const char *module_name; | 63 | const char *module_name; |
| 64 | const char *version; | 64 | const char *version; |
| 65 | }; | 65 | } __attribute__ ((__aligned__(sizeof(void *)))); |
| 66 | 66 | ||
| 67 | struct module_kobject | 67 | struct module_kobject |
| 68 | { | 68 | { |