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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-baltos.dtsi
diff --git
a/arch/arm/boot/dts/am335x-baltos.dtsi
b/arch/arm/boot/dts/am335x-baltos.dtsi
index ed7a5a3daa423cf6c935a2c25d56845949e0d9fd..8c6fc4161ad701d09e99612559a6b04a94ea6a83 100644
(file)
--- a/
arch/arm/boot/dts/am335x-baltos.dtsi
+++ b/
arch/arm/boot/dts/am335x-baltos.dtsi
@@
-396,7
+396,7
@@
compatible = "ti,wl1835";
reg = <2>;
interrupt-parent = <&gpio3>;
- interrupts = <7 IRQ_TYPE_
LEVEL_HIGH
>;
+ interrupts = <7 IRQ_TYPE_
EDGE_RISING
>;
};
};