diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /include/asm-x86/module.h | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'include/asm-x86/module.h')
| -rw-r--r-- | include/asm-x86/module.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/asm-x86/module.h b/include/asm-x86/module.h index bfedb247871c..48dc3e0c07d9 100644 --- a/include/asm-x86/module.h +++ b/include/asm-x86/module.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | #ifndef _ASM_MODULE_H | 1 | #ifndef ASM_X86__MODULE_H |
| 2 | #define _ASM_MODULE_H | 2 | #define ASM_X86__MODULE_H |
| 3 | 3 | ||
| 4 | /* x86_32/64 are simple */ | 4 | /* x86_32/64 are simple */ |
| 5 | struct mod_arch_specific {}; | 5 | struct mod_arch_specific {}; |
| @@ -79,4 +79,4 @@ struct mod_arch_specific {}; | |||
| 79 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE | 79 | # define MODULE_ARCH_VERMAGIC MODULE_PROC_FAMILY MODULE_STACKSIZE |
| 80 | #endif | 80 | #endif |
| 81 | 81 | ||
| 82 | #endif /* _ASM_MODULE_H */ | 82 | #endif /* ASM_X86__MODULE_H */ |