diff options
| author | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-01-07 03:50:18 -0500 |
| commit | ed03f430cdc8c802652467e9097606fedc2c7abc (patch) | |
| tree | 30941ec1e6f93e99358fefe18175e5dd800a4379 /include/asm-m32r/m32r.h | |
| parent | ed349a8a0a780ed27e2a765f16cee54d9b63bfee (diff) | |
| parent | 6f957eaf79356a32e838f5f262ee9a60544b1d5b (diff) | |
Pull pnpacpi into acpica branch
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 @@ #include <asm/m32r_mp_fpga.h> #elif defined(CONFIG_CHIP_VDEC2) || defined(CONFIG_CHIP_XNUX2) \ || defined(CONFIG_CHIP_M32700) || defined(CONFIG_CHIP_M32102) \ - || defined(CONFIG_CHIP_OPSP) + || defined(CONFIG_CHIP_OPSP) || defined(CONFIG_CHIP_M32104) #include <asm/m32102.h> #endif @@ -43,6 +43,10 @@ #include <asm/m32700ut/m32700ut_pld.h> #endif +#if defined(CONFIG_PLAT_M32104UT) +#include <asm/m32104ut/m32104ut_pld.h> +#endif /* CONFIG_PLAT_M32104 */ + /* * M32R Register */ @@ -122,7 +126,7 @@ #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 */ |