diff --git a/[refs] b/[refs] index b3426a52c476..cd20f094e68a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d30883942cfe8a1e3f88f8b7f4c292aeba3db5a +refs/heads/master: 891e5e5edaf13216f9f4c2710aebd066b1d98583 diff --git a/trunk/drivers/video/Kconfig b/trunk/drivers/video/Kconfig index 3e153d313bb0..e64ed16bd42f 100644 --- a/trunk/drivers/video/Kconfig +++ b/trunk/drivers/video/Kconfig @@ -525,11 +525,6 @@ config FB_GBE_MEM This is the amount of memory reserved for the framebuffer, which can be any value between 1MB and 8MB. -config BUS_I2C - bool - depends on (FB = y) && VISWS - default y - config FB_SUN3 bool "Sun3 framebuffer support" depends on (FB = y) && (SUN3 || SUN3X) && BROKEN