summaryrefslogtreecommitdiffstats
path: root/arch/sh/include/asm/processor.h
diff options
context:
space:
mode:
authorTom Rini <trini@ti.com>2014-01-09 11:04:53 -0500
committerTom Rini <trini@ti.com>2014-01-09 11:04:53 -0500
commit33d413fc91e0bbbb92962a80f5333d6f1f628c5b (patch)
tree18383b51425d37af1c526f276ecee8cc7f492d7d /arch/sh/include/asm/processor.h
parent2c30af8f1861f09f217097460bfbea5ea691f8b8 (diff)
parent5fe3aefd3dd0845ed4f69ba34b9790d3961d7ea8 (diff)
downloadtalos-obmc-uboot-33d413fc91e0bbbb92962a80f5333d6f1f628c5b.tar.gz
talos-obmc-uboot-33d413fc91e0bbbb92962a80f5333d6f1f628c5b.zip
Merge branch 'master' of git://git.denx.de/u-boot-sh
Diffstat (limited to 'arch/sh/include/asm/processor.h')
-rw-r--r--arch/sh/include/asm/processor.h8
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/sh/include/asm/processor.h b/arch/sh/include/asm/processor.h
index 938a89cff5..b8677da959 100644
--- a/arch/sh/include/asm/processor.h
+++ b/arch/sh/include/asm/processor.h
@@ -1,12 +1,10 @@
#ifndef _ASM_SH_PROCESSOR_H_
#define _ASM_SH_PROCESSOR_H_
-#if defined(CONFIG_SH2) || \
- defined (CONFIG_SH2A)
+#if defined(CONFIG_SH2)
# include <asm/cpu_sh2.h>
-#elif defined (CONFIG_SH3)
+#elif defined(CONFIG_SH3)
# include <asm/cpu_sh3.h>
-#elif defined (CONFIG_SH4) || \
- defined (CONFIG_SH4A)
+#elif defined(CONFIG_SH4)
# include <asm/cpu_sh4.h>
#endif
#endif
OpenPOWER on IntegriCloud