Merge branch 'bkl-removal' into next

[pandora-kernel.git] / drivers / char / lcd.c

diff --git a/drivers/char/lcd.c b/drivers/char/lcd.c
index 1f09626..1c29b20 100644 (file)
--- a/drivers/char/lcd.c
+++ b/drivers/char/lcd.c
@@ -20,12 +20,12 @@
 #include <linux/mc146818rtc.h>
 #include <linux/netdevice.h>
 #include <linux/sched.h>
+#include <linux/smp_lock.h>
 #include <linux/delay.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <asm/system.h>
-#include <linux/delay.h>
 
 #include "lcd.h"
 
@@ -415,6 +415,8 @@ static int lcd_ioctl(struct inode *inode, struct file *file,
 
 static int lcd_open(struct inode *inode, struct file *file)
 {
+       cycle_kernel_lock();
+
        if (!lcd_present)
                return -ENXIO;
        else