git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-pdu001.dts
diff --git
a/arch/arm/boot/dts/am335x-pdu001.dts
b/arch/arm/boot/dts/am335x-pdu001.dts
index 6dd9d487aaebc58329a0c8e108bb9243535cc017..ae43d61f4e8b4333fa137bd315f05e079fd812b6 100644
(file)
--- a/
arch/arm/boot/dts/am335x-pdu001.dts
+++ b/
arch/arm/boot/dts/am335x-pdu001.dts
@@
-585,7
+585,7
@@
bus-width = <4>;
pinctrl-names = "default";
pinctrl-0 = <&mmc2_pins>;
- cd-gpios = <&gpio2 2 GPIO_ACTIVE_
LOW
>;
+ cd-gpios = <&gpio2 2 GPIO_ACTIVE_
HIGH
>;
};
&sham {