diff --git a/[refs] b/[refs] index daf0173f97c4..be24ea426dd9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0d04c58aa41652f2adc369926bd944cbeb7ba5a2 +refs/heads/master: 702686ad72b8c215ec197bdbbae3141a96f0dd01 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 9a648eb8e213..e662b8a3e3cb 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2231,6 +2231,15 @@ F: Documentation/filesystems/quota.txt F: fs/quota/ F: include/linux/quota*.h +DISPLAYLINK USB 2.0 FRAMEBUFFER DRIVER (UDLFB) +M: Bernie Thompson +L: linux-fbdev@vger.kernel.org +S: Maintained +W: http://plugable.com/category/projects/udlfb/ +F: drivers/video/udlfb.c +F: include/video/udlfb.h +F: Documentation/fb/udlfb.txt + DISTRIBUTED LOCK MANAGER (DLM) M: Christine Caulfield M: David Teigland diff --git a/trunk/drivers/video/omap2/displays/Kconfig b/trunk/drivers/video/omap2/displays/Kconfig index 408a9927be92..74d29b552901 100644 --- a/trunk/drivers/video/omap2/displays/Kconfig +++ b/trunk/drivers/video/omap2/displays/Kconfig @@ -12,7 +12,7 @@ config PANEL_GENERIC_DPI config PANEL_DVI tristate "DVI output" - depends on OMAP2_DSS_DPI && I2C + depends on OMAP2_DSS_DPI help Driver for external monitors, connected via DVI. The driver uses i2c to read EDID information from the monitor. diff --git a/trunk/drivers/video/omap2/dss/apply.c b/trunk/drivers/video/omap2/dss/apply.c index 87b3e25294cf..052dc874cd3d 100644 --- a/trunk/drivers/video/omap2/dss/apply.c +++ b/trunk/drivers/video/omap2/dss/apply.c @@ -1276,9 +1276,6 @@ int dss_ovl_enable(struct omap_overlay *ovl) spin_unlock_irqrestore(&data_lock, flags); - /* wait for overlay to be enabled */ - wait_pending_extra_info_updates(); - mutex_unlock(&apply_lock); return 0; @@ -1316,9 +1313,6 @@ int dss_ovl_disable(struct omap_overlay *ovl) spin_unlock_irqrestore(&data_lock, flags); - /* wait for the overlay to be disabled */ - wait_pending_extra_info_updates(); - mutex_unlock(&apply_lock); return 0;