Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / drivers / char / lcd.h

diff --git a/drivers/char/lcd.h b/drivers/char/lcd.h
index 8aed498..a8d4ae7 100644 (file)
--- a/drivers/char/lcd.h
+++ b/drivers/char/lcd.h
@@ -22,7 +22,7 @@ static int timeout(volatile unsigned long);
 #define MAX_IDLE_TIME 120
 
 struct lcd_display {
-        unsigned long buttons;
+        unsigned buttons;
         int size1;
         int size2;
         unsigned char line1[LCD_CHARS_PER_LINE];
@@ -37,6 +37,8 @@ struct lcd_display {
 
 #define LCD_DRIVER     "Cobalt LCD Driver v2.10"
 
+#define LCD            "lcd: "
+
 #define kLCD_IR                0x0F000000
 #define kLCD_DR                0x0F000010
 #define kGPI           0x0D000000