| From 3c0ccb17644a4e67bc2c59eeba7b06cccc597850 Mon Sep 17 00:00:00 2001 |
| From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Date: Thu, 9 May 2013 00:05:40 +0000 |
| Subject: ARM: shmobile: r8a7778: correct model name in Kconfig |
| |
| The correct model name is R-Car M1A or R8A77781; R8A77780 corresponds to R-Car |
| M1S which is a SH based SoC. |
| |
| Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com> |
| Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> |
| [horms+renesas@verge.net.au: manually applied] |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| (cherry picked from commit 45fa9295a0215c99019653b06f11dcda0340a7f7) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| |
| Conflicts: |
| arch/arm/mach-shmobile/Kconfig |
| --- |
| arch/arm/mach-shmobile/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 638e5c57..7a927839 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -36,7 +36,7 @@ config ARCH_R8A7740 |
| select RENESAS_INTC_IRQPIN |
| |
| config ARCH_R8A7778 |
| - bool "R-Car M1 (R8A77780)" |
| + bool "R-Car M1 (R8A777801)" |
| select ARCH_WANT_OPTIONAL_GPIOLIB |
| select CPU_V7 |
| select SH_CLK_CPG |
| -- |
| 1.8.4.3.gca3854a |
| |
