diff options
| author | James Morris <james.morris@microsoft.com> | 2018-12-17 20:24:28 +0100 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-12-17 20:24:28 +0100 |
| commit | 8bd8ea195f6d135a8d85201116314eb5237ad7e7 (patch) | |
| tree | 3ef99e468f0b4b13cc11002aa60c4451e326191b /arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | |
| parent | security: fs: make inode explicitly non-modular (diff) | |
| parent | Linux 4.20-rc7 (diff) | |
| download | linux-8bd8ea195f6d135a8d85201116314eb5237ad7e7.tar.xz linux-8bd8ea195f6d135a8d85201116314eb5237ad7e7.zip | |
Merge tag 'v4.20-rc7' into next-general
Sync with Linux 4.20-rc7, to pick up: Revert "ovl: relax permission checking on underlying layers"
Diffstat (limited to 'arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts')
| -rw-r--r-- | arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts index 9d5d53fbe9c0..c39cf2ca54da 100644 --- a/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts +++ b/arch/arm/boot/dts/logicpd-torpedo-37xx-devkit.dts @@ -35,7 +35,7 @@ * jumpering combinations for the long run. */ &mmc3 { - interrupts-extended = <&intc 94 &omap3_pmx_core2 0x46>; + interrupts-extended = <&intc 94 &omap3_pmx_core 0x136>; pinctrl-0 = <&mmc3_pins &mmc3_core2_pins>; pinctrl-names = "default"; vmmc-supply = <&wl12xx_vmmc>; |