diff options
| author | Jeff Garzik <jgarzik@pretzel.yyz.us> | 2005-06-22 13:07:28 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-06-22 13:07:28 -0400 |
| commit | ff40c6d3d1437ecdf295b8e39adcb06c3d6021ef (patch) | |
| tree | 3666d029b4bd4df2909dbefd9c7a09e6042b7d32 /include/asm-m32r/m32r.h | |
| parent | 8bf62ecee58360749c5f0e68bc97d5e02a6816b1 (diff) | |
| parent | 2a5a68b840cbab31baab2d9b2e1e6de3b289ae1e (diff) | |
Merge upstream kernel changes into 'C/H/S support' branch of libata.
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 |