projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Update from upstream with manual merge of Yasunori Goto's
[powerpc.git]
/
arch
/
xtensa
/
mm
/
init.c
diff --git
a/arch/xtensa/mm/init.c
b/arch/xtensa/mm/init.c
index
56aace8
..
5a91d6c
100644
(file)
--- a/
arch/xtensa/mm/init.c
+++ b/
arch/xtensa/mm/init.c
@@
-239,7
+239,7
@@
void __init mem_init(void)
high_memory = (void *) __va(max_mapnr << PAGE_SHIFT);
highmemsize = 0;
-#if CONFIG_HIGHMEM
+#if
def
CONFIG_HIGHMEM
#error HIGHGMEM not implemented in init.c
#endif