diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-27 06:22:13 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2024-02-27 06:22:13 +0100 |
| commit | 13a44ba0dca8c133a4368323683a270a3874d88c (patch) | |
| tree | ee41cdfbf84cee2b507d7471287bdd1934f5130b /arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi | |
| parent | 1643281347f80116a500e6a17726351a7265a55c (diff) | |
| parent | d206a76d7d2726f3b096037f2079ce0bd3ba329b (diff) | |
| download | linux-stable-13a44ba0dca8c133a4368323683a270a3874d88c.tar.gz linux-stable-13a44ba0dca8c133a4368323683a270a3874d88c.tar.bz2 linux-stable-13a44ba0dca8c133a4368323683a270a3874d88c.zip | |
Merge 6.8-rc6 into tty-next
We need the tty/serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi b/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi index 1640763fd4af..ff0d684622f7 100644 --- a/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi +++ b/arch/arm/boot/dts/nvidia/tegra30-apalis-v1.1.dtsi @@ -997,7 +997,6 @@ compatible = "st,stmpe811"; reg = <0x41>; irq-gpio = <&gpio TEGRA_GPIO(V, 0) GPIO_ACTIVE_LOW>; - interrupt-controller; id = <0>; blocks = <0x5>; irq-trigger = <0x1>; |