diff options
author | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
---|---|---|
committer | David Woodhouse <dwmw2@shinybook.infradead.org> | 2005-08-09 11:51:35 -0400 |
commit | c973b112c76c9d8fd042991128f218a738cc8d0a (patch) | |
tree | e813b0da5d0a0e19e06de6462d145a29ad683026 /drivers/video/Kconfig | |
parent | c5fbc3966f48279dbebfde10248c977014aa9988 (diff) | |
parent | 00dd1e433967872f3997a45d5adf35056fdf2f56 (diff) |
Merge with /shiny/git/linux-2.6/.git
Diffstat (limited to 'drivers/video/Kconfig')
-rw-r--r-- | drivers/video/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 04d3120f7236..cde0ed097af6 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
@@ -1399,8 +1399,8 @@ config FB_TX3912 | |||
1399 | Say Y here to enable kernel support for the on-board framebuffer. | 1399 | Say Y here to enable kernel support for the on-board framebuffer. |
1400 | 1400 | ||
1401 | config FB_G364 | 1401 | config FB_G364 |
1402 | bool | 1402 | bool "G364 frame buffer support" |
1403 | depends on MIPS_MAGNUM_4000 || OLIVETTI_M700 | 1403 | depends on (FB = y) && (MIPS_MAGNUM_4000 || OLIVETTI_M700) |
1404 | select FB_CFB_FILLRECT | 1404 | select FB_CFB_FILLRECT |
1405 | select FB_CFB_COPYAREA | 1405 | select FB_CFB_COPYAREA |
1406 | select FB_CFB_IMAGEBLIT | 1406 | select FB_CFB_IMAGEBLIT |