Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm

[~andy/linux] / drivers / video / sa1100fb.h

diff --git a/drivers/video/sa1100fb.h b/drivers/video/sa1100fb.h
index 48066ef3af05fa2356171a76932e8252b62b05e5..1c3b459865d85fa6460e4db523056b56338ebefe 100644 (file)
--- a/drivers/video/sa1100fb.h
+++ b/drivers/video/sa1100fb.h
@@ -57,9 +57,10 @@ struct sa1100fb_lcd_reg {
        unsigned long lccr3;
 };
 
-#define RGB_8  (0)
-#define RGB_16 (1)
-#define NR_RGB 2
+#define RGB_4  (0)
+#define RGB_8  (1)
+#define RGB_16 (2)
+#define NR_RGB 3
 
 struct sa1100fb_info {
        struct fb_info          fb;
@@ -100,7 +101,7 @@ struct sa1100fb_info {
 
        volatile u_char         state;
        volatile u_char         task_state;
-       struct semaphore        ctrlr_sem;
+       struct mutex            ctrlr_lock;
        wait_queue_head_t       ctrlr_wait;
        struct work_struct      task;
 
@@ -132,7 +133,7 @@ struct sa1100fb_info {
  *  Debug macros 
  */
 #if DEBUG
-#  define DPRINTK(fmt, args...)        printk("%s: " fmt, __FUNCTION__ , ## args)
+#  define DPRINTK(fmt, args...)        printk("%s: " fmt, __func__ , ## args)
 #else
 #  define DPRINTK(fmt, args...)
 #endif