From: Stephen Rothwell Date: Tue, 4 Oct 2011 03:34:13 +0000 (+1100) Subject: Merge remote-tracking branch 'fbdev/fbdev-next' X-Git-Tag: next-20111004~38 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=072eee3b3a99e8c53498403e325c946ba6dab2c7;p=karo-tx-linux.git Merge remote-tracking branch 'fbdev/fbdev-next' Conflicts: drivers/video/Kconfig --- 072eee3b3a99e8c53498403e325c946ba6dab2c7 diff --cc MAINTAINERS index 26645ddef93f,988422185e8d..e9f72983d805 --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -5965,8 -5918,14 +5965,14 @@@ SMSC9420 PCI ETHERNET DRIVE M: Steve Glendinning L: netdev@vger.kernel.org S: Supported -F: drivers/net/smsc9420.* +F: drivers/net/ethernet/smsc/smsc9420.* + SMSC UFX6000 and UFX7000 USB to VGA DRIVER + M: Steve Glendinning + L: linux-fbdev@vger.kernel.org + S: Supported + F: drivers/video/smscufx.c + SN-IA64 (Itanium) SUB-PLATFORM M: Jes Sorensen L: linux-altix@sgi.com diff --cc drivers/video/Kconfig index 55a7df4ea8de,8165c5577d71..d83e967e4e15 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig @@@ -1755,10 -1764,11 +1764,11 @@@ config FB_AU110 config FB_AU1200 bool "Au1200 LCD Driver" - depends on (FB = y) && MIPS && SOC_AU1200 + depends on (FB = y) && MIPS_ALCHEMY - select FB_CFB_FILLRECT - select FB_CFB_COPYAREA - select FB_CFB_IMAGEBLIT + select FB_SYS_FILLRECT + select FB_SYS_COPYAREA + select FB_SYS_IMAGEBLIT + select FB_SYS_FOPS help This is the framebuffer driver for the AMD Au1200 SOC. It can drive various panels and CRTs by passing in kernel cmd line option