projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide-2.6
[linux-2.6-block.git]
/
drivers
/
macintosh
/
ans-lcd.c
diff --git
a/drivers/macintosh/ans-lcd.c
b/drivers/macintosh/ans-lcd.c
index 73c50bc02095e26b31ec61d76ee81f7f46e4e36d..6a8221893256f55f79bf24cd5fcdcca72cfe3d6a 100644
(file)
--- a/
drivers/macintosh/ans-lcd.c
+++ b/
drivers/macintosh/ans-lcd.c
@@
-3,6
+3,7
@@
*/
#include <linux/types.h>
+#include <linux/smp_lock.h>
#include <linux/errno.h>
#include <linux/kernel.h>
#include <linux/miscdevice.h>
@@
-119,6
+120,7
@@
anslcd_ioctl( struct inode * inode, struct file * file,
static int
anslcd_open( struct inode * inode, struct file * file )
{
+ cycle_kernel_lock();
return 0;
}