diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 17:36:07 +0200 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2014-05-22 17:36:07 +0200 |
| commit | d82b40133f2a7d50e491cecb64e4ea01dabd8672 (patch) | |
| tree | 5d5e468bee175a0ef1403e07df7bb09f08dba2db /arch/arm/boot/dts/at91sam9rl.dtsi | |
| parent | Linux 3.15-rc4 (diff) | |
| parent | dt-bindings: clock: Move at91.h to dt-bindigs/clock (diff) | |
| download | linux-d82b40133f2a7d50e491cecb64e4ea01dabd8672.tar.xz linux-d82b40133f2a7d50e491cecb64e4ea01dabd8672.zip | |
Merge branch 'at91-3.15-fixes' into at91-3.16-dt3
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 63e1784d272c..92a52faebef7 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> |