diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 17:00:24 +0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-06-21 17:00:24 +0400 |
| commit | e8f2ca97151892ab723dd8317313063cef79839d (patch) | |
| tree | 147047c432e3af4cad25b4672b493b93edc32844 /arch/arm/boot/dts/exynos4412.dtsi | |
| parent | 704b1005d1e23fa35a32e591a32183c309917bbd (diff) | |
| parent | eff4e7c7f32a4e4be60b19b209ffab5cb430b385 (diff) | |
| download | linux-e8f2ca97151892ab723dd8317313063cef79839d.tar.xz | |
Merge tag 'soc-exynos5420-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/late
From Kukjin Kim:
based on tags/common-clk-audio
- add support for exynos5420 SoC
* tag 'soc-exynos5420-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
ARM: EXYNOS: extend soft-reset support for EXYNOS5420
ARM: EXYNOS: add secondary CPU boot base location for EXYNOS5420
clocksource: exynos_mct: use (request/free)_irq calls for local timer registration
ARM: dts: Add initial device tree support for EXYNOS5420
clk: exynos5420: register clocks using common clock framework
ARM: EXYNOS: use four additional chipid bits to identify EXYNOS family
serial: samsung: select EXYNOS specific driver data if ARCH_EXYNOS is defined
ARM: EXYNOS: Add support for EXYNOS5420 SoC
ARM: dts: list the CPU nodes for EXYNOS5250
ARM: dts: fork out common EXYNOS5 nodes
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/exynos4412.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/exynos4412.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/exynos4412.dtsi b/arch/arm/boot/dts/exynos4412.dtsi index 270b389e0a1b..e743e677a9e2 100644 --- a/arch/arm/boot/dts/exynos4412.dtsi +++ b/arch/arm/boot/dts/exynos4412.dtsi @@ -17,7 +17,7 @@ * published by the Free Software Foundation. */ -/include/ "exynos4x12.dtsi" +#include "exynos4x12.dtsi" / { compatible = "samsung,exynos4412"; |