diff options
| author | Olof Johansson <olof@lixom.net> | 2013-05-28 07:36:06 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-05-28 07:43:36 +0200 |
| commit | b891e30e55c4d47d6b3c4de1b4f89e7683104c93 (patch) | |
| tree | ff32f9e6f7e5b687706d6c7906fd8649994c2727 /arch/arm/boot/dts/at91sam9x25ek.dts | |
| parent | Linux 3.10-rc3 (diff) | |
| parent | ARM: at91: udpate defconfigs (diff) | |
| download | linux-b891e30e55c4d47d6b3c4de1b4f89e7683104c93.tar.xz linux-b891e30e55c4d47d6b3c4de1b4f89e7683104c93.zip | |
Merge tag 'at91-cleanup' of git://github.com/at91linux/linux-at91 into next/cleanup
From Nicolas Ferre:
Big update converting pinctrl to use macros and header files. Increases
readability and avoids typos.
Update of AT91 defconfigs and merge of defconfigs for the similar SoCs
sam9260/9g20 and sam9261/9g10.
* tag 'at91-cleanup' of git://github.com/at91linux/linux-at91:
ARM: at91: udpate defconfigs
ARM: at91: dt: switch to standard IRQ flag defines
ARM: at91: dt: switch to pinctrl to pre-processor
ARM: at91: dt: add pinctrl pre-processor define
ARM: at91: dt: switch to standard GPIO flag defines.
ARM: at91: dt: use #include for all device trees
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x25ek.dts')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x25ek.dts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9x25ek.dts b/arch/arm/boot/dts/at91sam9x25ek.dts index 315250b4995e..494864836e83 100644 --- a/arch/arm/boot/dts/at91sam9x25ek.dts +++ b/arch/arm/boot/dts/at91sam9x25ek.dts @@ -7,8 +7,8 @@ * Licensed under GPLv2 or later. */ /dts-v1/; -/include/ "at91sam9x25.dtsi" -/include/ "at91sam9x5ek.dtsi" +#include "at91sam9x25.dtsi" +#include "at91sam9x5ek.dtsi" / { model = "Atmel AT91SAM9X25-EK"; |