diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-01-07 09:40:05 -0500 |
| commit | 123656d4cc8c946f578ebd18c2050f5251720428 (patch) | |
| tree | 3d5432eff034a3b9cfdc98b37e245abe5695342d /include/asm-m32r/m32r.h | |
| parent | a62c80e559809e6c7851ec04d30575e85ad6f6ed (diff) | |
| parent | 0aec63e67c69545ca757a73a66f5dcf05fa484bf (diff) | |
Merge with Linus' kernel.
Diffstat (limited to 'include/asm-m32r/m32r.h')
| -rw-r--r-- | include/asm-m32r/m32r.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h index ec142be00862..b133ca61acf1 100644 --- a/include/asm-m32r/m32r.h +++ b/include/asm-m32r/m32r.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | #include <asm/m32r_mp_fpga.h> | 14 | #include <asm/m32r_mp_fpga.h> |
| 15 | #elif defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \ | 15 | #elif defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \ |
| 16 | || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \ | 16 | || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \ |
| 17 | || defined(CONFIG_CHIP_OPSP) | 17 | || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104) |
| 18 | #include <asm/m32102.h> | 18 | #include <asm/m32102.h> |
| 19 | #endif | 19 | #endif |
| 20 | 20 | ||
| @@ -43,6 +43,10 @@ | |||
| 43 | #include <asm/m32700ut/m32700ut_pld.h> | 43 | #include <asm/m32700ut/m32700ut_pld.h> |
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | #if defined(CONFIG_PLAT_M32104UT) | ||
| 47 | #include <asm/m32104ut/m32104ut_pld.h> | ||
| 48 | #endif /* CONFIG_PLAT_M32104 */ | ||
| 49 | |||
| 46 | /* | 50 | /* |
| 47 | * M32R Register | 51 | * M32R Register |
| 48 | */ | 52 | */ |
| @@ -122,7 +126,7 @@ | |||
| 122 | 126 | ||
| 123 | #include <asm/page.h> | 127 | #include <asm/page.h> |
| 124 | #ifdef CONFIG_MMU | 128 | #ifdef CONFIG_MMU |
| 125 | #define NONCACHE_OFFSET __PAGE_OFFSET+0x20000000 | 129 | #define NONCACHE_OFFSET (__PAGE_OFFSET + 0x20000000) |
| 126 | #else | 130 | #else |
| 127 | #define NONCACHE_OFFSET __PAGE_OFFSET | 131 | #define NONCACHE_OFFSET __PAGE_OFFSET |
| 128 | #endif /* CONFIG_MMU */ | 132 | #endif /* CONFIG_MMU */ |