diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-19 13:04:47 -0400 |
| commit | 3e10e879a8c334a5927d800a3663a24d562cfa31 (patch) | |
| tree | 5d18bc7e38c986a044e99aa0d0a4aff4931ec7d0 /include/linux/module.h | |
| parent | 98d9c66ab07471006fd7910cb16453581c41a3e7 (diff) | |
| parent | 0cfd81031a26717fe14380d18275f8e217571615 (diff) | |
Merge branch 'linus' into tracing-v28-for-linus-v3
Conflicts:
init/main.c
kernel/module.c
scripts/bootgraph.pl
Diffstat (limited to 'include/linux/module.h')
| -rw-r--r-- | include/linux/module.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/module.h b/include/linux/module.h index 8b6113503863..5d2970cdce93 100644 --- a/include/linux/module.h +++ b/include/linux/module.h | |||
| @@ -350,7 +350,6 @@ struct module | |||
| 350 | /* Reference counts */ | 350 | /* Reference counts */ |
| 351 | struct module_ref ref[NR_CPUS]; | 351 | struct module_ref ref[NR_CPUS]; |
| 352 | #endif | 352 | #endif |
| 353 | |||
| 354 | }; | 353 | }; |
| 355 | #ifndef MODULE_ARCH_INIT | 354 | #ifndef MODULE_ARCH_INIT |
| 356 | #define MODULE_ARCH_INIT {} | 355 | #define MODULE_ARCH_INIT {} |