diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-02-23 22:05:47 -0500 |
| commit | a00428f5b149e36b8225b2a0812742a6dfb07b8c (patch) | |
| tree | a78869cd67cf78a0eb091fb0ea5d397734bd6738 /drivers/video/Kconfig | |
| parent | 774fee58c465ea1c7e9775e347ec307bcf2deeb3 (diff) | |
| parent | fb5c594c2acc441f0d2d8f457484a0e0e9285db3 (diff) | |
Merge ../powerpc-merge
Diffstat (limited to 'drivers/video/Kconfig')
| -rw-r--r-- | drivers/video/Kconfig | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig index 3e153d313bb0..e64ed16bd42f 100644 --- a/drivers/video/Kconfig +++ b/drivers/video/Kconfig | |||
| @@ -525,11 +525,6 @@ config FB_GBE_MEM | |||
| 525 | This is the amount of memory reserved for the framebuffer, | 525 | This is the amount of memory reserved for the framebuffer, |
| 526 | which can be any value between 1MB and 8MB. | 526 | which can be any value between 1MB and 8MB. |
| 527 | 527 | ||
| 528 | config BUS_I2C | ||
| 529 | bool | ||
| 530 | depends on (FB = y) && VISWS | ||
| 531 | default y | ||
| 532 | |||
| 533 | config FB_SUN3 | 528 | config FB_SUN3 |
| 534 | bool "Sun3 framebuffer support" | 529 | bool "Sun3 framebuffer support" |
| 535 | depends on (FB = y) && (SUN3 || SUN3X) && BROKEN | 530 | depends on (FB = y) && (SUN3 || SUN3X) && BROKEN |