diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2014-04-26 11:29:30 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-04-26 11:29:30 +0200 |
| commit | 12e8e5952598714faa6f202ab028bcd291337cce (patch) | |
| tree | bba92ecf29110bd779888aa21d6270866651a2e4 /arch/arm/boot/dts/at91sam9rl.dtsi | |
| parent | 76e7745e8e4330fdb30f049303d524261c0b7a2c (diff) | |
| parent | 35d35aae817706800a4913711d563a99e1dc380a (diff) | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
3.15 fixes for AT91
- one little DT fix
- the use of proper directory for clock in include/dt-bindings
it allows to remove the now empty include/dt-bindings/clk
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
dt-bindings: clock: Move at91.h to dt-bindigs/clock
ARM: at91: fix spi cs on sama5d3 Xplained board
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9rl.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9rl.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi index 63e1784d272..92a52faebef 100644 --- a/arch/arm/boot/dts/at91sam9rl.dtsi +++ b/arch/arm/boot/dts/at91sam9rl.dtsi @@ -8,7 +8,7 @@ #include "skeleton.dtsi" #include <dt-bindings/pinctrl/at91.h> -#include <dt-bindings/clk/at91.h> +#include <dt-bindings/clock/at91.h> #include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/gpio/gpio.h> |