diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 14:25:05 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2013-05-25 14:25:05 +0400 |
| commit | 373e42a25dcc53782c1b1eca086dadf8b5adb546 (patch) | |
| tree | 8b9e56b9426a35486a5a5d6169edf0442b67b733 /arch/arm/boot/dts/at91sam9g15.dtsi | |
| parent | 30eb987e02b3481e8b9c41d564eed49928f91478 (diff) | |
| parent | 0bfd8ffeff9dda08c69381d65c72e0aa58706ef6 (diff) | |
Merge branch 'tracking-linux-3.x.y' into merge-linux-linaro-lsk
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g15.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g15.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9g15.dtsi b/arch/arm/boot/dts/at91sam9g15.dtsi index fbe7a7089c2..28467fd6bf9 100644 --- a/arch/arm/boot/dts/at91sam9g15.dtsi +++ b/arch/arm/boot/dts/at91sam9g15.dtsi @@ -10,7 +10,7 @@ / { model = "Atmel AT91SAM9G15 SoC"; - compatible = "atmel, at91sam9g15, atmel,at91sam9x5"; + compatible = "atmel,at91sam9g15", "atmel,at91sam9x5"; ahb { apb { |