diff options
| author | Len Brown <len.brown@intel.com> | 2007-07-22 02:28:33 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-07-22 02:28:33 -0400 |
| commit | 5e16e3f0e24dadb79b96b6134cd3303f0d42f0c5 (patch) | |
| tree | 23f79d982edce49deef5e42b14ce7980c8b7eb94 /drivers/video | |
| parent | dcb76f88683618ed6ef0df66643dba1285881ee5 (diff) | |
| parent | f70ac0e9651aa8c07dffe72a44872f92054d42c3 (diff) | |
Pull video into release branch
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/Kconfig | 7 | ||||
| -rw-r--r-- | drivers/video/Makefile | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 2a237f09ee5d..564cc9b51822 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -12,6 +12,13 @@ config VGASTATE tristate default n +config VIDEO_OUTPUT_CONTROL + tristate "Lowlevel video output switch controls" + default m + help + This framework adds support for low-level control of the video + output switch. + config FB tristate "Support for frame buffer devices" ---help--- diff --git a/drivers/video/Makefile b/drivers/video/Makefile index a562f9d69d2c..518933d4905f 100644 --- 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 + +#video output switch sysfs driver +obj-$(CONFIG_VIDEO_OUTPUT_CONTROL) += output.o |