diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-02-07 18:31:54 +0100 |
| commit | 673f8205914a12e928c65afbcd78ae748f78df53 (patch) | |
| tree | 38c60215646d079fab3bff812e094e914960c7ec /arch/m68k/include/asm/segment.h | |
| parent | cf47b8f3d96b0b8b10b557444a28b3ca4024ff82 (diff) | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
| download | op-kernel-dev-673f8205914a12e928c65afbcd78ae748f78df53.zip op-kernel-dev-673f8205914a12e928c65afbcd78ae748f78df53.tar.gz | |
Merge branch 'linus' into core/locking
Conflicts:
fs/btrfs/locking.c
Diffstat (limited to 'arch/m68k/include/asm/segment.h')
| -rw-r--r-- | arch/m68k/include/asm/segment.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/m68k/include/asm/segment.h b/arch/m68k/include/asm/segment.h new file mode 100644 index 0000000..82583bc --- /dev/null +++ b/arch/m68k/include/asm/segment.h @@ -0,0 +1,5 @@ +#ifdef __uClinux__ +#include "segment_no.h" +#else +#include "segment_mm.h" +#endif |
