diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-12 13:50:03 -0400 |
| commit | e049d1ca3094f3d1d94617f456a9961202f96e3a (patch) | |
| tree | a30397ad22f2fbea268bd28fa69c60aad9dfa62a /drivers/video/Kconfig | |
| parent | edfac96a92b88d3b0b53e3f8231b74beee9ecd1d (diff) | |
| parent | 80584ff3b99c36ead7e130e453b3a48b18072d18 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 35d2abd1ed50..5af684b40496 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1320,7 +1320,7 @@ config FB_AU1100 | |||
| 1320 | 1320 | ||
| 1321 | config FB_AU1200 | 1321 | config FB_AU1200 |
| 1322 | bool "Au1200 LCD Driver" | 1322 | bool "Au1200 LCD Driver" |
| 1323 | depends on FB && MIPS && SOC_AU1200 | 1323 | depends on (FB = y) && MIPS && SOC_AU1200 |
| 1324 | select FB_CFB_FILLRECT | 1324 | select FB_CFB_FILLRECT |
| 1325 | select FB_CFB_COPYAREA | 1325 | select FB_CFB_COPYAREA |
| 1326 | select FB_CFB_IMAGEBLIT | 1326 | select FB_CFB_IMAGEBLIT |
| @@ -1470,7 +1470,7 @@ config FB_G364 | |||
| 1470 | 1470 | ||
| 1471 | config FB_68328 | 1471 | config FB_68328 |
| 1472 | bool "Motorola 68328 native frame buffer support" | 1472 | bool "Motorola 68328 native frame buffer support" |
| 1473 | depends on FB && (M68328 || M68EZ328 || M68VZ328) | 1473 | depends on (FB = y) && (M68328 || M68EZ328 || M68VZ328) |
| 1474 | select FB_CFB_FILLRECT | 1474 | select FB_CFB_FILLRECT |
| 1475 | select FB_CFB_COPYAREA | 1475 | select FB_CFB_COPYAREA |
| 1476 | select FB_CFB_IMAGEBLIT | 1476 | select FB_CFB_IMAGEBLIT |
| @@ -1616,7 +1616,7 @@ config FB_IBM_GXT4500 | |||
| 1616 | 1616 | ||
| 1617 | config FB_PS3 | 1617 | config FB_PS3 |
| 1618 | bool "PS3 GPU framebuffer driver" | 1618 | bool "PS3 GPU framebuffer driver" |
| 1619 | depends on FB && PS3_PS3AV | 1619 | depends on (FB = y) && PS3_PS3AV |
| 1620 | select FB_CFB_FILLRECT | 1620 | select FB_CFB_FILLRECT |
| 1621 | select FB_CFB_COPYAREA | 1621 | select FB_CFB_COPYAREA |
| 1622 | select FB_CFB_IMAGEBLIT | 1622 | select FB_CFB_IMAGEBLIT |