git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394...
[pandora-kernel.git]
/
drivers
/
input
/
misc
/
hp_sdc_rtc.c
diff --git
a/drivers/input/misc/hp_sdc_rtc.c
b/drivers/input/misc/hp_sdc_rtc.c
index
ab76ea4
..
49d8abf
100644
(file)
--- a/
drivers/input/misc/hp_sdc_rtc.c
+++ b/
drivers/input/misc/hp_sdc_rtc.c
@@
-35,6
+35,7
@@
#include <linux/hp_sdc.h>
#include <linux/errno.h>
#include <linux/hp_sdc.h>
#include <linux/errno.h>
+#include <linux/smp_lock.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/init.h>
#include <linux/module.h>
@@
-408,6
+409,7
@@
static unsigned int hp_sdc_rtc_poll(struct file *file, poll_table *wait)
static int hp_sdc_rtc_open(struct inode *inode, struct file *file)
{
static int hp_sdc_rtc_open(struct inode *inode, struct file *file)
{
+ cycle_kernel_lock();
return 0;
}
return 0;
}
@@
-691,6
+693,11
@@
static int __init hp_sdc_rtc_init(void)
{
int ret;
{
int ret;
+#ifdef __mc68000__
+ if (!MACH_IS_HP300)
+ return -ENODEV;
+#endif
+
init_MUTEX(&i8042tregs);
if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))
init_MUTEX(&i8042tregs);
if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))