diff options
| author | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-12-02 01:13:38 -0500 |
| commit | ff9c38bba37937adb909cceb2a6521f2e92e17c6 (patch) | |
| tree | 93bd6152d9fa28348be99ef1c788040cc7b7a94d /arch/arm/include | |
| parent | 65c0cfafce9575319fb6f70080fbe226e5617e3b (diff) | |
| parent | b2722b1c3a893ec6021508da15b32282ec79f4da (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/ht.c
Diffstat (limited to 'arch/arm/include')
| -rw-r--r-- | arch/arm/include/asm/kmap_types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/include/asm/kmap_types.h b/arch/arm/include/asm/kmap_types.h index d16ec97ec9a..c019949a518 100644 --- a/arch/arm/include/asm/kmap_types.h +++ b/arch/arm/include/asm/kmap_types.h | |||
| @@ -22,4 +22,10 @@ enum km_type { | |||
| 22 | KM_TYPE_NR | 22 | KM_TYPE_NR |
| 23 | }; | 23 | }; |
| 24 | 24 | ||
| 25 | #ifdef CONFIG_DEBUG_HIGHMEM | ||
| 26 | #define KM_NMI (-1) | ||
| 27 | #define KM_NMI_PTE (-1) | ||
| 28 | #define KM_IRQ_PTE (-1) | ||
| 29 | #endif | ||
| 30 | |||
| 25 | #endif | 31 | #endif |