diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 10:57:42 -0800 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /drivers/video/Kconfig | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
| download | kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.gz kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.tar.xz kernel-crypto-5c6baba84e1ac6a79b266b40e17e692aab6604a1.zip | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 6b89eb55ed3..bb5fbed89e7 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@ -2066,6 +2066,7 @@ config XEN_FBDEV_FRONTEND select FB_SYS_IMAGEBLIT select FB_SYS_FOPS select FB_DEFERRED_IO + select XEN_XENBUS_FRONTEND default y help This driver implements the front-end of the Xen virtual @@ -2164,6 +2165,7 @@ config FB_BROADSHEET a bridge adapter. source "drivers/video/omap/Kconfig" +source "drivers/video/omap2/Kconfig" source "drivers/video/backlight/Kconfig" source "drivers/video/display/Kconfig" |