diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-02-10 14:45:43 -0500 |
| commit | 81b7bbd1932a04869d4c8635a75222dfc6089f96 (patch) | |
| tree | 285ae868a1e3a41fb0dbfe346c28e380949bcb55 /drivers/video/Kconfig | |
| parent | 98051995ab44b993f992946055edc6115351f725 (diff) | |
| parent | 66efc5a7e3061c3597ac43a8bb1026488d57e66b (diff) | |
Merge branch 'linus'
Conflicts:
drivers/scsi/ipr.c
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 4e83f01e894e..45fe65d8d7a0 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -1444,8 +1444,8 @@ config FB_PMAG_AA | |||
| 1444 | used mainly in the MIPS-based DECstation series. | 1444 | used mainly in the MIPS-based DECstation series. |
| 1445 | 1445 | ||
| 1446 | config FB_PMAG_BA | 1446 | config FB_PMAG_BA |
| 1447 | bool "PMAG-BA TURBOchannel framebuffer support" | 1447 | tristate "PMAG-BA TURBOchannel framebuffer support" |
| 1448 | depends on (FB = y) && TC | 1448 | depends on FB && TC |
| 1449 | select FB_CFB_FILLRECT | 1449 | select FB_CFB_FILLRECT |
| 1450 | select FB_CFB_COPYAREA | 1450 | select FB_CFB_COPYAREA |
| 1451 | select FB_CFB_IMAGEBLIT | 1451 | select FB_CFB_IMAGEBLIT |
| @@ -1454,8 +1454,8 @@ config FB_PMAG_BA | |||
| 1454 | used mainly in the MIPS-based DECstation series. | 1454 | used mainly in the MIPS-based DECstation series. |
| 1455 | 1455 | ||
| 1456 | config FB_PMAGB_B | 1456 | config FB_PMAGB_B |
| 1457 | bool "PMAGB-B TURBOchannel framebuffer support" | 1457 | tristate "PMAGB-B TURBOchannel framebuffer support" |
| 1458 | depends on (FB = y) && TC | 1458 | depends on TC |
| 1459 | select FB_CFB_FILLRECT | 1459 | select FB_CFB_FILLRECT |
| 1460 | select FB_CFB_COPYAREA | 1460 | select FB_CFB_COPYAREA |
| 1461 | select FB_CFB_IMAGEBLIT | 1461 | select FB_CFB_IMAGEBLIT |