compat-drivers: remove HDMI
This is now part of compat. Having this here was
tainting the kernel as its not a module upstream,
its either enabled and built into the kernel or
disabled.
Signed-off-by: Luis R. Rodriguez <mcgrof@do-not-panic.com>
diff --git a/Makefile b/Makefile
index 3642a8e..dc25969 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@
obj-$(CONFIG_COMPAT_RFKILL) += net/rfkill/
obj-$(CONFIG_COMPAT_VIDEO_MODULES) += drivers/gpu/drm/
-obj-$(CONFIG_COMPAT_VIDEO_MODULES) += drivers/video/
obj-$(CONFIG_COMPAT_MEDIA_MODULES) += drivers/media/v4l2-core/
obj-$(CONFIG_COMPAT_MEDIA_MODULES) += drivers/media/usb/uvc/
diff --git a/config.mk b/config.mk
index 3881787..1c75c55 100644
--- a/config.mk
+++ b/config.mk
@@ -728,7 +728,6 @@
# tests have only started on 3.2.
ifndef CONFIG_COMPAT_KERNEL_3_2
# Basic DRM support
-export CONFIG_COMPAT_HDMI=m
export CONFIG_COMPAT_VIDEO_MODULES=y
export CONFIG_COMPAT_DRM=m
export CONFIG_COMPAT_DRM_TTM=m
diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index f82d70b..40ecd56 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -745,11 +745,6 @@
# Finally get the DRM top-level makefile
cp $GIT_TREE/drivers/gpu/drm/Makefile drivers/gpu/drm
-
- DIR="drivers/video"
- cp $GIT_TREE/$DIR/hdmi.c $DIR
- echo "obj-\$(CONFIG_COMPAT_HDMI) += hdmi.o" > $DIR/Makefile
- cp $GIT_TREE/include/linux/hdmi.h include/linux/hdmi.h
else
touch drivers/gpu/drm/Makefile
touch drivers/video/Makefile
