diff options
author | 2020-08-12 19:17:18 +0200 | |
---|---|---|
committer | 2020-08-12 20:42:08 +0200 | |
commit | 534b1f9071d95325044c21d47d9f63a45cdf425e (patch) | |
tree | 5c2aa3cd65bfb6b9e73d9ad22c021d800380f0f6 /arch/arm/boot/dts/omap4-duovero-parlor.dts | |
parent | drm/radeon: drop superflous AGP handling (diff) | |
parent | drm/ttm: revert "drm/ttm: make TT creation purely optional v3" (diff) | |
download | linux-dev-534b1f9071d95325044c21d47d9f63a45cdf425e.tar.xz linux-dev-534b1f9071d95325044c21d47d9f63a45cdf425e.zip |
Merge drm/drm-next into drm-misc-next
Backmerging drm-next into drm-misc-next for nouveau and panel updates.
Resolves a conflict between ttm and nouveau, where struct ttm_mem_res got
renamed to struct ttm_resource.
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Diffstat (limited to 'arch/arm/boot/dts/omap4-duovero-parlor.dts')
-rw-r--r-- | arch/arm/boot/dts/omap4-duovero-parlor.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap4-duovero-parlor.dts b/arch/arm/boot/dts/omap4-duovero-parlor.dts index 8047e8cdb3af..4548d87534e3 100644 --- a/arch/arm/boot/dts/omap4-duovero-parlor.dts +++ b/arch/arm/boot/dts/omap4-duovero-parlor.dts @@ -139,7 +139,7 @@ ethernet@gpmc { reg = <5 0 0xff>; interrupt-parent = <&gpio2>; - interrupts = <12 IRQ_TYPE_EDGE_FALLING>; /* gpio_44 */ + interrupts = <12 IRQ_TYPE_LEVEL_LOW>; /* gpio_44 */ phy-mode = "mii"; |