Pull video into release branch

[sfrench/cifs-2.6.git] / drivers / video / Makefile

diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index a562f9d69d2c2285bc7e633e59ec6c5ec4d884d9..518933d4905f4f97098dac3608d13ccb81503ec4 100644 (file)
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -123,3 +123,6 @@ obj-$(CONFIG_FB_OF)               += offb.o
 
 # the test framebuffer is last
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o
 
 # the test framebuffer is last
 obj-$(CONFIG_FB_VIRTUAL)          += vfb.o

+
+#video output switch sysfs driver
+obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o