projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[POWERPC] Merge common virtex header files
[powerpc.git]
/
include
/
asm-m32r
/
m32r.h
diff --git
a/include/asm-m32r/m32r.h
b/include/asm-m32r/m32r.h
index
f9bb48a
..
decfc59
100644
(file)
--- a/
include/asm-m32r/m32r.h
+++ b/
include/asm-m32r/m32r.h
@@
-7,7
+7,6
@@
* Copyright (C) 2003, 2004 Renesas Technology Corp.
*/
* Copyright (C) 2003, 2004 Renesas Technology Corp.
*/
-#include <linux/config.h>
/* Chip type */
#if defined(CONFIG_CHIP_XNUX_MP) || defined(CONFIG_CHIP_XNUX2_MP)
/* Chip type */
#if defined(CONFIG_CHIP_XNUX_MP) || defined(CONFIG_CHIP_XNUX2_MP)
@@
-126,7
+125,7
@@
#include <asm/page.h>
#ifdef CONFIG_MMU
#include <asm/page.h>
#ifdef CONFIG_MMU
-#define NONCACHE_OFFSET
__PAGE_OFFSET+0x20000000
+#define NONCACHE_OFFSET
(__PAGE_OFFSET + 0x20000000)
#else
#define NONCACHE_OFFSET __PAGE_OFFSET
#endif /* CONFIG_MMU */
#else
#define NONCACHE_OFFSET __PAGE_OFFSET
#endif /* CONFIG_MMU */