summaryrefslogtreecommitdiffstats
path: root/drivers/video/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-08 10:04:17 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-08 10:04:17 -0700
commitc5f347579a661c9506e794315f0798b75ef71d35 (patch)
treeeb900af7a9f758fe775ded478645fcc1ce75328f /drivers/video/Kconfig
parent537d84787659b355b3331813dc134c7497ddafa5 (diff)
parentf27098379b1dbfedae99e5b86e10529f799d4071 (diff)
downloadop-kernel-dev-c5f347579a661c9506e794315f0798b75ef71d35.zip
op-kernel-dev-c5f347579a661c9506e794315f0798b75ef71d35.tar.gz
Merge branch 'for-linus' of git://github.com/schandinat/linux-2.6
* 'for-linus' of git://github.com/schandinat/linux-2.6: drivers/video/via/via-gpio.c: fix warning viafb: Depends on X86 fbdev: section cleanup in viafb driver viafb: fix accel_flags check_var bug viafb: probe cleanups viafb: remove ioctls which break the framebuffer interface viafb: update fix before calculating depth viafb: PLL value cleanup viafb: simplify lcd size "detection" viafb: fix PCI table viafb: add lcd scaling support for some IGPs viafb: improve lcd code readability viafb: remove duplicated scaling code MAINTAINERS: update viafb entry
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r--drivers/video/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index 7b11ea6..a9ca72f 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -1505,7 +1505,7 @@ config FB_SIS_315
config FB_VIA
tristate "VIA UniChrome (Pro) and Chrome9 display support"
- depends on FB && PCI
+ depends on FB && PCI && X86
select FB_CFB_FILLRECT
select FB_CFB_COPYAREA
select FB_CFB_IMAGEBLIT
OpenPOWER on IntegriCloud