Oops, no potentially conflicting declarations please.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8749 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 2 insertions, 3 deletions

diff --git a/firmware/drivers/lcd-2bit-horz.c b/firmware/drivers/lcd-2bit-horz.c
index 185affbcad..164e94cb73 100644
--- a/firmware/drivers/lcd-2bit-horz.c
+++ b/firmware/drivers/lcd-2bit-horz.c
@@ -38,8 +38,6 @@
 
 /*** globals ***/
 
-#define FB_WIDTH ((LCD_WIDTH+3)/4)
-
 unsigned char lcd_framebuffer[LCD_HEIGHT][FB_WIDTH] IBSS_ATTR;
 
 static const unsigned char dibits[16] ICONST_ATTR = {
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index d56f39d09c..87dda891b9 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -194,7 +194,8 @@ typedef void lcd_fastpixelfunc_type(fb_data *address);
 extern fb_data lcd_framebuffer[LCD_HEIGHT/8][LCD_WIDTH];
 #elif LCD_DEPTH == 2
 #if LCD_PIXELFORMAT == HORIZONTAL_PACKING
-extern fb_data lcd_framebuffer[LCD_HEIGHT][LCD_WIDTH/4];
+#define FB_WIDTH ((LCD_WIDTH+3)/4)
+extern fb_data lcd_framebuffer[LCD_HEIGHT][FB_WIDTH];
 #else
 extern fb_data lcd_framebuffer[LCD_HEIGHT/4][LCD_WIDTH];
 #endif