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/powerpc | |
| 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/powerpc')
| -rw-r--r-- | arch/powerpc/include/asm/kmap_types.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/kmap_types.h b/arch/powerpc/include/asm/kmap_types.h index b6bac6f61c16..916369575c97 100644 --- a/arch/powerpc/include/asm/kmap_types.h +++ b/arch/powerpc/include/asm/kmap_types.h | |||
| @@ -29,5 +29,16 @@ enum km_type { | |||
| 29 | KM_TYPE_NR | 29 | KM_TYPE_NR |
| 30 | }; | 30 | }; |
| 31 | 31 | ||
| 32 | /* | ||
| 33 | * This is a temporary build fix that (so they say on lkml....) should no longer | ||
| 34 | * be required after 2.6.33, because of changes planned to the kmap code. | ||
| 35 | * Let's try to remove this cruft then. | ||
| 36 | */ | ||
| 37 | #ifdef CONFIG_DEBUG_HIGHMEM | ||
| 38 | #define KM_NMI (-1) | ||
| 39 | #define KM_NMI_PTE (-1) | ||
| 40 | #define KM_IRQ_PTE (-1) | ||
| 41 | #endif | ||
| 42 | |||
| 32 | #endif /* __KERNEL__ */ | 43 | #endif /* __KERNEL__ */ |
| 33 | #endif /* _ASM_POWERPC_KMAP_TYPES_H */ | 44 | #endif /* _ASM_POWERPC_KMAP_TYPES_H */ |