aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-04-01 19:14:16 -0700
committerLuis R. Rodriguez <mcgrof@do-not-panic.com>2013-04-01 19:49:10 -0700
commitb6284c611a5b51539b2b8a7c57fead780b922f22 (patch)
tree16ab64e13e68501de46de9c43a1ad309886ef2b9
parent4f1c439ec282c47508c61189f58712186ec11d55 (diff)
downloadcompat-drivers-old-b6284c611a5b51539b2b8a7c57fead780b922f22.tar.gz
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>
-rw-r--r--Makefile1
-rw-r--r--config.mk1
-rwxr-xr-xscripts/admin-update.sh5
3 files changed, 0 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 3642a8e8..dc259697 100644
--- a/Makefile
+++ b/Makefile
@@ -42,7 +42,6 @@ obj-y := compat/
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 38817879..1c75c554 100644
--- a/config.mk
+++ b/config.mk
@@ -728,7 +728,6 @@ endif #CONFIG_COMPAT_KERNEL_2_6_31
# 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 f82d70be..40ecd56d 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -745,11 +745,6 @@ if [[ "$ENABLE_DRM" == "1" ]]; then
# 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