diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 17:36:33 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-05-21 17:36:33 -0700 |
| commit | 03c1b4e8e560455a2634a76998883a22f1a01207 (patch) | |
| tree | 30ca1237d094d66df1dc1533f7bf39b3877b5932 /arch/arm/boot/dts/sama5d3_tcb1.dtsi | |
| parent | ac49b9a9f26b6c42585f87857722085ef4b19c13 (diff) | |
| parent | e6ab9a20e73e790d47e6aa231fcf66f27b6ce3d4 (diff) | |
Merge remote-tracking branch 'origin/x86/espfix' into x86/vdso
Merge x86/espfix into x86/vdso, due to changes in the vdso setup code
that otherwise cause conflicts.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/arm/boot/dts/sama5d3_tcb1.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/sama5d3_tcb1.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/sama5d3_tcb1.dtsi b/arch/arm/boot/dts/sama5d3_tcb1.dtsi index 382b04431f66..02848453ca0c 100644 --- a/arch/arm/boot/dts/sama5d3_tcb1.dtsi +++ b/arch/arm/boot/dts/sama5d3_tcb1.dtsi @@ -9,7 +9,7 @@ #include <dt-bindings/pinctrl/at91.h> #include <dt-bindings/interrupt-controller/irq.h> -#include <dt-bindings/clk/at91.h> +#include <dt-bindings/clock/at91.h> / { aliases { |