diff --git a/[refs] b/[refs] index 7d029b18c1e2..f3c97a50ac44 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a67ef278e24b1fe5ab8f5e8ef27f9654b91732de +refs/heads/master: 45649fdb54c2e3feb59a8648608ed601511f2098 diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index a9ca72f301bf..c9d4de2dd53f 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -1931,7 +1931,7 @@ config FB_TMIO_ACCELL config FB_S3C tristate "Samsung S3C framebuffer support" - depends on FB && ARCH_S3C64XX + depends on FB && S3C_DEV_FB select FB_CFB_FILLRECT select FB_CFB_COPYAREA select FB_CFB_IMAGEBLIT