diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 21:50:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 21:50:57 -0400 |
| commit | a5324343955997d1439f26518ddac567cd5d134b (patch) | |
| tree | f43558389c41e3a0f076c4ee55d77c4aa1561779 /include/asm-m32r/m32r.h | |
| parent | 8199d3a79c224bbe5943fa08684e1f93a17881b0 (diff) | |
| parent | a4936044001694f033fe4ea94d6034d51a6b465c (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-m32r/m32r.h')
| -rw-r--r-- | include/asm-m32r/m32r.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-m32r/m32r.h b/include/asm-m32r/m32r.h index f116649bbef3..ec142be00862 100644 --- a/include/asm-m32r/m32r.h +++ b/include/asm-m32r/m32r.h | |||
| @@ -16,7 +16,6 @@ | |||
| 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) |
| 18 | #include <asm/m32102.h> | 18 | #include <asm/m32102.h> |
| 19 | #include <asm/m32102peri.h> | ||
| 20 | #endif | 19 | #endif |
| 21 | 20 | ||
| 22 | /* Platform type */ | 21 | /* Platform type */ |
| @@ -36,6 +35,10 @@ | |||
| 36 | #include <asm/mappi2/mappi2_pld.h> | 35 | #include <asm/mappi2/mappi2_pld.h> |
| 37 | #endif /* CONFIG_PLAT_MAPPI2 */ | 36 | #endif /* CONFIG_PLAT_MAPPI2 */ |
| 38 | 37 | ||
| 38 | #if defined(CONFIG_PLAT_MAPPI3) | ||
| 39 | #include <asm/mappi3/mappi3_pld.h> | ||
| 40 | #endif /* CONFIG_PLAT_MAPPI3 */ | ||
| 41 | |||
| 39 | #if defined(CONFIG_PLAT_USRV) | 42 | #if defined(CONFIG_PLAT_USRV) |
| 40 | #include <asm/m32700ut/m32700ut_pld.h> | 43 | #include <asm/m32700ut/m32700ut_pld.h> |
| 41 | #endif | 44 | #endif |