diff options
| author | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-26 20:43:16 -0500 |
| commit | 3eacdf58c2c0b9507afedfc19108e98b992c31e4 (patch) | |
| tree | d95e7e022ff6e6181edce43fe97cf2883b5a91ed /arch/m68k/include/asm/segment.h | |
| parent | dd0a251c8e087bca05e8f9a3657078591ae6e12b (diff) | |
| parent | 5376071069ec8a7e6a8112beab16fc24f5139475 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
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 000000000000..82583bc004bd --- /dev/null +++ b/arch/m68k/include/asm/segment.h | |||
| @@ -0,0 +1,5 @@ | |||
| 1 | #ifdef __uClinux__ | ||
| 2 | #include "segment_no.h" | ||
| 3 | #else | ||
| 4 | #include "segment_mm.h" | ||
| 5 | #endif | ||