diff --git a/[refs] b/[refs] index caca0767b9d3..f611b2e4525a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d1029b56329b1cc9b7233e5333c1a48ddbbfad8 +refs/heads/master: e5dd3cbd81aad69bdf773ab63c06fbaabc2b767a diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 002b61b4f0f6..e0c5f96b273d 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -1825,12 +1825,13 @@ config FB_FSL_DIU config FB_W100 tristate "W100 frame buffer support" - depends on FB && PXA_SHARPSL + depends on FB && ARCH_PXA select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT ---help--- Frame buffer driver for the w100 as found on the Sharp SL-Cxx series. + It can also drive the w3220 chip found on iPAQ hx4700. This driver is also available as a module ( = code which can be inserted and removed from the running kernel whenever you want). The