arch: Fix name collision with ACPI's video.o
commit34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec
authorThomas Zimmermann <tzimmermann@suse.de>
Fri, 17 May 2024 09:14:33 +0000 (17 11:14 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 20 May 2024 21:17:06 +0000 (20 21:17 +0000)
tree756118ee8eb174d02588d7123895982653f84a06
parente7cda7fe37ff1ece39bd2bf35ea68b1175395d95
arch: Fix name collision with ACPI's video.o

Commit 2fd001cd3600 ("arch: Rename fbdev header and source files")
renames the video source files under arch/ such that they do not
refer to fbdev any longer. The new files named video.o conflict with
ACPI's video.ko module. Modprobing the ACPI module can then fail with
warnings about missing symbols, as shown below.

  (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_unregister (err -2)
  (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register_backlight (err -2)
  (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol __acpi_video_get_backlight_type (err -2)
  (i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register (err -2)

Fix the issue by renaming the architecture's video.o to video-common.o.

Reported-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Closes: https://lore.kernel.org/intel-gfx/9dcac6e9-a3bf-4ace-bbdc-f697f767f9e0@suse.de/T/#t
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: 2fd001cd3600 ("arch: Rename fbdev header and source files")
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/sparc/video/Makefile
arch/sparc/video/video-common.c [moved from arch/sparc/video/video.c with 100% similarity]
arch/x86/video/Makefile
arch/x86/video/video-common.c [moved from arch/x86/video/video.c with 100% similarity]