diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:23:35 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-07-31 10:23:35 +0200 |
| commit | 5b929bd11df23922daf1be5d52731cc3900c1d79 (patch) | |
| tree | 105fa5987b03c9f4e0260a9eb04dff7bb3d16839 /arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | |
| parent | x86/build: Fix detection of GCC -mpreferred-stack-boundary support (diff) | |
| parent | x86/ldt: Make modify_ldt synchronous (diff) | |
| download | linux-5b929bd11df23922daf1be5d52731cc3900c1d79.tar.xz linux-5b929bd11df23922daf1be5d52731cc3900c1d79.zip | |
Merge branch 'x86/urgent' into x86/asm, before applying dependent patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/arm/boot/dts/imx6qdl-hummingboard.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-hummingboard.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi index 62a82f3eba88..6dd0b764e036 100644 --- a/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi +++ b/arch/arm/boot/dts/imx6qdl-hummingboard.dtsi @@ -299,6 +299,6 @@ &pinctrl_hummingboard_usdhc2 >; vmmc-supply = <®_3p3v>; - cd-gpios = <&gpio1 4 0>; + cd-gpios = <&gpio1 4 GPIO_ACTIVE_LOW>; status = "okay"; }; |