diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
| commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
| tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/video/Kconfig | |
| parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
| parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) | |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 5af684b40496..b1cb72c3780f 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -139,7 +139,7 @@ config FB_TILEBLITTING | |||
| 139 | This is particularly important to one driver, matroxfb. If | 139 | This is particularly important to one driver, matroxfb. If |
| 140 | unsure, say N. | 140 | unsure, say N. |
| 141 | 141 | ||
| 142 | comment "Frambuffer hardware drivers" | 142 | comment "Frame buffer hardware drivers" |
| 143 | depends on FB | 143 | depends on FB |
| 144 | 144 | ||
| 145 | config FB_CIRRUS | 145 | config FB_CIRRUS |