diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2014-05-23 18:13:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2014-05-23 18:13:15 +0200 |
| commit | 756abc8d6de06f0afc2121f69030f0d3f4f8177a (patch) | |
| tree | 1c31c952bd02846fcc7d2f43062f036b0eea787c /arch/arm/boot | |
| parent | Merge tag 'mvebu-fixes-3.15-2' of git://git.infradead.org/linux-mvebu into fixes (diff) | |
| parent | ARM: at91: sam9260: fix compilation issues (diff) | |
| download | linux-dev-756abc8d6de06f0afc2121f69030f0d3f4f8177a.tar.xz linux-dev-756abc8d6de06f0afc2121f69030f0d3f4f8177a.zip | |
Merge tag 'at91-fixes2' of git://github.com/at91linux/linux-at91 into fixes
Second 3.15 fixes for AT91
- two fixes concerning iio ADC triggers for at91sam9260 and at91sam9g20
one for the "device" file, the other for the DT.
* tag 'at91-fixes2' of git://github.com/at91linux/linux-at91:
ARM: at91: sam9260: fix compilation issues
ARM: at91/dt: sam9260: correct external trigger value
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index 366fc2cbcd64..c0e0eae16a27 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi @@ -641,7 +641,7 @@ trigger@3 { reg = <3>; trigger-name = "external"; - trigger-value = <0x13>; + trigger-value = <0xd>; trigger-external; }; }; |