diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-07-10 23:28:26 -0400 |
| commit | bf22f6fe2d72b4d7e9035be8ceb340414cf490e3 (patch) | |
| tree | 14085d90de0428316479fe6de8a0c6d32e6e65e2 /drivers/video/Kconfig | |
| parent | 4eb6bf6bfb580afaf1e1a1d30cba17a078530cf4 (diff) | |
| parent | 93ab471889c6662b42ce7da257f31f24c08d7d9e (diff) | |
Merge branch 'for-2.6.23' into merge
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 403dac787ebf..9b7a76be36a0 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1790,8 +1790,8 @@ config FB_IBM_GXT4500 | |||
| 1790 | adaptor, found on some IBM System P (pSeries) machines. | 1790 | adaptor, found on some IBM System P (pSeries) machines. |
| 1791 | 1791 | ||
| 1792 | config FB_PS3 | 1792 | config FB_PS3 |
| 1793 | bool "PS3 GPU framebuffer driver" | 1793 | tristate "PS3 GPU framebuffer driver" |
| 1794 | depends on (FB = y) && PS3_PS3AV | 1794 | depends on FB && PS3_PS3AV |
| 1795 | select FB_SYS_FILLRECT | 1795 | select FB_SYS_FILLRECT |
| 1796 | select FB_SYS_COPYAREA | 1796 | select FB_SYS_COPYAREA |
| 1797 | select FB_SYS_IMAGEBLIT | 1797 | select FB_SYS_IMAGEBLIT |