diff options
| author | Olof Johansson <olof@lixom.net> | 2015-01-21 15:23:24 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-01-21 15:23:24 -0800 |
| commit | a62d351dc54543513bdae5ff5dd679f6bffde632 (patch) | |
| tree | 199052df89f330a4cc6e08d18910eb780b03d7b2 /arch/arm/mach-sti/board-dt.c | |
| parent | 7f09a46fe9e0d5cb68a16c50f06e11600830b340 (diff) | |
| parent | dd548cf910809d2fb4429b42b899673bec1f3095 (diff) | |
| download | op-kernel-dev-a62d351dc54543513bdae5ff5dd679f6bffde632.zip op-kernel-dev-a62d351dc54543513bdae5ff5dd679f6bffde632.tar.gz | |
Merge tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti into next/soc
Merge "ARM: STi: SoC changes for v3.20, round 1" from Maxime Coquelin:
Highlights:
-----------
- Add support for STiH418 SoC
* tag 'sti-soc-for-v3.20-1' of git://git.stlinux.com/devel/kernel/linux-sti:
ARM: STi: Add STiH418 SoC support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-sti/board-dt.c')
| -rw-r--r-- | arch/arm/mach-sti/board-dt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-sti/board-dt.c b/arch/arm/mach-sti/board-dt.c index 3cf6ef8..b067390 100644 --- a/arch/arm/mach-sti/board-dt.c +++ b/arch/arm/mach-sti/board-dt.c @@ -18,6 +18,7 @@ static const char *stih41x_dt_match[] __initdata = { "st,stih415", "st,stih416", "st,stih407", + "st,stih418", NULL }; |
