diff options
author | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2013-05-15 12:42:15 -0700 |
commit | 15a6affec4449b54afba15ab7edbad0cac2736d3 (patch) | |
tree | f2fa815f74be0b56acd05e62113600a7113d48a9 /arch/arm/boot/dts/omap4-var-som.dts | |
parent | cd432fc233f4e7aba43b4fe499a4445f0f6ee1c6 (diff) | |
parent | f722406faae2d073cc1d01063d1123c35425939e (diff) |
Merge tag 'v3.10-rc1' into linaro-android-3.10-experimental-mergetracking-linaro-android-3.10-llct-20130518.0
Linux 3.10-rc1
Diffstat (limited to 'arch/arm/boot/dts/omap4-var-som.dts')
-rw-r--r-- | arch/arm/boot/dts/omap4-var-som.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts index 222a413c2c51..7e04103779c4 100644 --- a/arch/arm/boot/dts/omap4-var-som.dts +++ b/arch/arm/boot/dts/omap4-var-som.dts @@ -68,7 +68,7 @@ spi-max-frequency = <24000000>; reg = <0>; interrupt-parent = <&gpio6>; - interrupts = <11>; /* gpio line 171 */ + interrupts = <11 8>; /* gpio line 171, low triggered */ vdd-supply = <&vdd_eth>; }; }; |