diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-29 01:11:23 -0400 |
| commit | 7b7e394185014e0f3bd8989cac937003f20ef9ce (patch) | |
| tree | 3beda5f979bba0aa9822534e239cf1b45f3be69c /drivers/video/Kconfig | |
| parent | ddc5d3414593e4d7ad7fbd33e7f7517fcc234544 (diff) | |
| parent | 693f7d362055261882659475d2ef022e32edbff1 (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index f87c0171f4ec..4587087d777a 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -400,6 +400,8 @@ config FB_ASILIANT | |||
| 400 | select FB_CFB_FILLRECT | 400 | select FB_CFB_FILLRECT |
| 401 | select FB_CFB_COPYAREA | 401 | select FB_CFB_COPYAREA |
| 402 | select FB_CFB_IMAGEBLIT | 402 | select FB_CFB_IMAGEBLIT |
| 403 | help | ||
| 404 | This is the frame buffer device driver for the Asiliant 69030 chipset | ||
| 403 | 405 | ||
| 404 | config FB_IMSTT | 406 | config FB_IMSTT |
| 405 | bool "IMS Twin Turbo display support" | 407 | bool "IMS Twin Turbo display support" |
| @@ -961,7 +963,7 @@ config FB_ATY128 | |||
| 961 | 963 | ||
| 962 | config FB_ATY | 964 | config FB_ATY |
| 963 | tristate "ATI Mach64 display support" if PCI || ATARI | 965 | tristate "ATI Mach64 display support" if PCI || ATARI |
| 964 | depends on FB | 966 | depends on FB && !SPARC32 |
| 965 | select FB_CFB_FILLRECT | 967 | select FB_CFB_FILLRECT |
| 966 | select FB_CFB_COPYAREA | 968 | select FB_CFB_COPYAREA |
| 967 | select FB_CFB_IMAGEBLIT | 969 | select FB_CFB_IMAGEBLIT |