diff options
| author | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2009-02-02 12:52:39 -0500 |
| commit | 8f04915532485d81e7f6c580a396ea7b01094221 (patch) | |
| tree | c5740e961a025f2fb6b520a2bc5937f19d4345ab /arch/m68k/include/asm/module.h | |
| parent | 8f5140a6a0b1a9aa79585b0008e88c5d266c5c1d (diff) | |
| parent | 45c82b5a770be66845687a7d027c8b52946d59af (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/m68k/include/asm/module.h')
| -rw-r--r-- | arch/m68k/include/asm/module.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/module.h b/arch/m68k/include/asm/module.h new file mode 100644 index 00000000000..79b59d137dd --- /dev/null +++ b/arch/m68k/include/asm/module.h | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | #ifdef __uClinux__ | ||
| 2 | #include "module_no.h" | ||
| 3 | #else | ||
| 4 | #include "module_mm.h" | ||
| 5 | #endif | ||