diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-24 06:48:46 -0400 |
| commit | 8c82a17e9c924c0e9f13e75e4c2f6bca19a4b516 (patch) | |
| tree | d535f46a917e14e90deccb29ad00aac016ad18dd /include/asm-um/highmem.h | |
| parent | 4ce72a2c063a7fa8e42a9435440ae3364115a58d (diff) | |
| parent | 57f8f7b60db6f1ed2c6918ab9230c4623a9dbe37 (diff) | |
Merge commit 'v2.6.28-rc1' into sched/urgent
Diffstat (limited to 'include/asm-um/highmem.h')
| -rw-r--r-- | include/asm-um/highmem.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/include/asm-um/highmem.h b/include/asm-um/highmem.h deleted file mode 100644 index 36974cb8abc..00000000000 --- a/include/asm-um/highmem.h +++ /dev/null | |||
| @@ -1,12 +0,0 @@ | |||
| 1 | #ifndef __UM_HIGHMEM_H | ||
| 2 | #define __UM_HIGHMEM_H | ||
| 3 | |||
| 4 | #include "asm/page.h" | ||
| 5 | #include "asm/fixmap.h" | ||
| 6 | #include "asm/arch/highmem.h" | ||
| 7 | |||
| 8 | #undef PKMAP_BASE | ||
| 9 | |||
| 10 | #define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK) | ||
| 11 | |||
| 12 | #endif | ||