diff options
| author | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:34:11 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2012-06-07 23:34:11 +0200 |
| commit | 76aef69e49318863cb9966f872a80ddb5586d666 (patch) | |
| tree | f53fb2a645e9a0516e48aaefc862cdf6326fc528 /arch/sh/include/asm/cpu_sh2.h | |
| parent | 25315683fd2197b2ecec0ac05427cbdebfb88274 (diff) | |
| parent | 99fc4fd168f2eff3237f05c6ec4e2bbffe9c06e5 (diff) | |
| download | u-boot-imx-76aef69e49318863cb9966f872a80ddb5586d666.zip u-boot-imx-76aef69e49318863cb9966f872a80ddb5586d666.tar.gz u-boot-imx-76aef69e49318863cb9966f872a80ddb5586d666.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-sh
* 'master' of git://git.denx.de/u-boot-sh:
sh/ap_sh4a_4a: Fix typo of operator in ET0_ETXD4
sh: Add SH7269 device and RSK2+SH7269 board
sh: Set CONFIG_SH_ETHER_PHY_MODE and CONFIG_SH_ETHER_SH7734_MII to boards with sh_eth
sh: Add support for AP-SH4A-4A board
sh: Add register definition of PFC for SH7734
sh: r0p7734: Add support I2C controller
sh: Add bit control functions
sh: Add support for r0p7734 board
sh: Add support Renesas SH7734
Signed-off-by: Wolfgang Denk <wd@denx.de>
Diffstat (limited to 'arch/sh/include/asm/cpu_sh2.h')
| -rw-r--r-- | arch/sh/include/asm/cpu_sh2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sh/include/asm/cpu_sh2.h b/arch/sh/include/asm/cpu_sh2.h index 767e189..28be591 100644 --- a/arch/sh/include/asm/cpu_sh2.h +++ b/arch/sh/include/asm/cpu_sh2.h @@ -35,6 +35,8 @@ # include <asm/cpu_sh7203.h> #elif defined(CONFIG_CPU_SH7264) # include <asm/cpu_sh7264.h> +#elif defined(CONFIG_CPU_SH7269) +# include <asm/cpu_sh7269.h> #else # error "Unknown SH2 variant" #endif |