diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 10:47:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-12-11 10:47:41 +0300 |
| commit | 2fc10246766fce0b560f015e1c0b6ff29fb4ced0 (patch) | |
| tree | 0510322a0d3a8171afb1e06a7ce809f023578825 /arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts | |
| parent | 05eec0c931a63d8709009e3ac6a083072666fa0f (diff) | |
| parent | 50c4c4e268a2d7a3e58ebb698ac74da0de40ae36 (diff) | |
| download | linux-2fc10246766fce0b560f015e1c0b6ff29fb4ced0.tar.xz | |
Merge 4.15-rc3 into char-misc-next
We want the fixes and changes in here for testing.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts')
| -rw-r--r-- | arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts index d99e3731358c..254d6795c67e 100644 --- a/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts +++ b/arch/arm64/boot/dts/socionext/uniphier-ld20-ref.dts @@ -40,7 +40,6 @@ }; ðsc { - interrupt-parent = <&gpio>; interrupts = <0 8>; }; |