1 files changed, 16 insertions, 1 deletions

diff --git a/drivers/video/Kconfig b/drivers/video/Kconfig
index d08d7998a4aa..9c31277b3a81 100644
--- a/drivers/video/Kconfig
+++ b/drivers/video/Kconfig
@@ -2045,7 +2045,7 @@ config FB_S3C_DEBUG_REGWRITE
        bool "Debug register writes"
        depends on FB_S3C
        ---help---
-         Show all register writes via printk(KERN_DEBUG)
+         Show all register writes via pr_debug()
 
 config FB_S3C2410
         tristate "S3C2410 LCD framebuffer support"
@@ -2442,4 +2442,19 @@ config FB_SH_MOBILE_MERAM
           Up to 4 memory channels can be configured, allowing 4 RGB or
           2 YCbCr framebuffers to be configured.
 
+config FB_SSD1307
+        tristate "Solomon SSD1307 framebuffer support"
+        depends on FB && I2C
+        depends on OF
+        depends on GENERIC_GPIO
+        select FB_SYS_FOPS
+        select FB_SYS_FILLRECT
+        select FB_SYS_COPYAREA
+        select FB_SYS_IMAGEBLIT
+        select FB_DEFERRED_IO
+        select PWM
+        help
+          This driver implements support for the Solomon SSD1307
+          OLED controller over I2C.
+
 endmenu