diff mbox series

[1/3] Revert "UBUNTU: SAUCE: (no-up) rename the adv7511 drm driver to adv7511_drm"

Message ID 20211122180632.72792-3-tjaalton@ubuntu.com
State New
Headers show
Series drm/amdgpu: Add USB4 support for DP tunneling | expand

Commit Message

Timo Aaltonen Nov. 22, 2021, 6:06 p.m. UTC 
From: Timo Aaltonen <timo.aaltonen@canonical.com>

This reverts commit ec786666ca5a562cc722bfd137f9f09b271cbe2a.

adv7511 media driver was renamed by upstream commit

commit b2ce5617dad254230551feda3599f2cc68e53ad8
Author: Anders Roxell <anders.roxell@linaro.org>
Date:   Wed Jun 12 12:19:35 2019 -0400

    media: i2c: fix warning same module names

so this commit can be reverted now.

Signed-off-by: Timo Aaltonen <timo.aaltonen@canonical.com>
---
 debian.master/abi/arm64/generic-64k.modules  | 2 +-
 debian.master/abi/arm64/generic.modules      | 2 +-
 debian.master/abi/armhf/generic-lpae.modules | 2 +-
 debian.master/abi/armhf/generic.modules      | 2 +-
 debian.master/abi/ppc64el/generic.modules    | 2 +-
 drivers/gpu/drm/bridge/adv7511/Makefile      | 8 ++++----
 6 files changed, 9 insertions(+), 9 deletions(-)
diff mbox series

Patch

diff --git a/debian.master/abi/arm64/generic-64k.modules b/debian.master/abi/arm64/generic-64k.modules
index ab19a24bce4e..2b579b919aef 100644
--- a/debian.master/abi/arm64/generic-64k.modules
+++ b/debian.master/abi/arm64/generic-64k.modules
@@ -240,7 +240,7 @@  adv7183
 adv7343
 adv7393
 adv748x
-adv7511_drm
+adv7511
 adv7604
 adv7842
 adv_pci1710
diff --git a/debian.master/abi/arm64/generic.modules b/debian.master/abi/arm64/generic.modules
index d065a6f0b4d4..e93134dcf52b 100644
--- a/debian.master/abi/arm64/generic.modules
+++ b/debian.master/abi/arm64/generic.modules
@@ -240,7 +240,7 @@  adv7183
 adv7343
 adv7393
 adv748x
-adv7511_drm
+adv7511
 adv7604
 adv7842
 adv_pci1710
diff --git a/debian.master/abi/armhf/generic-lpae.modules b/debian.master/abi/armhf/generic-lpae.modules
index bda8c8d56390..6e4af53cdeb0 100644
--- a/debian.master/abi/armhf/generic-lpae.modules
+++ b/debian.master/abi/armhf/generic-lpae.modules
@@ -232,7 +232,7 @@  adv7183
 adv7343
 adv7393
 adv748x
-adv7511_drm
+adv7511
 adv7604
 adv7842
 adv_pci1710
diff --git a/debian.master/abi/armhf/generic.modules b/debian.master/abi/armhf/generic.modules
index 6bf0991bfce7..d5c4a2810fb9 100644
--- a/debian.master/abi/armhf/generic.modules
+++ b/debian.master/abi/armhf/generic.modules
@@ -234,7 +234,7 @@  adv7183
 adv7343
 adv7393
 adv748x
-adv7511_drm
+adv7511
 adv7604
 adv7842
 adv_pci1710
diff --git a/debian.master/abi/ppc64el/generic.modules b/debian.master/abi/ppc64el/generic.modules
index 04c7d6b84de0..a55189d290ea 100644
--- a/debian.master/abi/ppc64el/generic.modules
+++ b/debian.master/abi/ppc64el/generic.modules
@@ -231,7 +231,7 @@  adv7183
 adv7343
 adv7393
 adv748x
-adv7511_drm
+adv7511
 adv7604
 adv7842
 adv_pci1710
diff --git a/drivers/gpu/drm/bridge/adv7511/Makefile b/drivers/gpu/drm/bridge/adv7511/Makefile
index c426b9064c92..d8ceb534b51f 100644
--- a/drivers/gpu/drm/bridge/adv7511/Makefile
+++ b/drivers/gpu/drm/bridge/adv7511/Makefile
@@ -1,5 +1,5 @@ 
 # SPDX-License-Identifier: GPL-2.0-only
-adv7511_drm-y := adv7511_drv.o adv7533.o
-adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o
-adv7511_drm-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o
-obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511_drm.o
+adv7511-y := adv7511_drv.o adv7533.o
+adv7511-$(CONFIG_DRM_I2C_ADV7511_AUDIO) += adv7511_audio.o
+adv7511-$(CONFIG_DRM_I2C_ADV7511_CEC) += adv7511_cec.o
+obj-$(CONFIG_DRM_I2C_ADV7511) += adv7511.o