Merge branch 'sr@denx.de' of git://git.denx.de/u-boot-staging

[karo-tx-uboot.git] / drivers / video / sed156x.c

diff --git a/drivers/video/sed156x.c b/drivers/video/sed156x.c
index e9d5ed4ccfb8a1356a01a73c881cd1ac37287917..a610b74ce661c77a2698ebe00dd81e5ef7b26531 100644 (file)
--- a/drivers/video/sed156x.c
+++ b/drivers/video/sed156x.c
@@ -28,8 +28,6 @@
 
 #include <sed156x.h>
 
-#ifdef CONFIG_SED156X
-
 /* configure according to the selected display */
 #if defined(CONFIG_SED156X_PG12864Q)
 #define LCD_WIDTH      128
@@ -43,6 +41,7 @@
 
 /* include the font data */
 #include <video_font.h>
+#include <video_font_data.h>
 
 #if VIDEO_FONT_WIDTH != 8 || VIDEO_FONT_HEIGHT != 16
 #error Expecting VIDEO_FONT_WIDTH == 8 && VIDEO_FONT_HEIGHT == 16
@@ -562,5 +561,3 @@ void sed156x_init(void)
        sed156x_sync();
        sed156x_cmd_transfer(LCD_ON);                   /* Turn display ON        */
 }
-
-#endif /* CONFIG_SED156X */