diff --git a/[refs] b/[refs] index 043f5cd44658..e42778d48a5a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a09ba31a54dbc9a548c4ff90619e4c7128a4282e +refs/heads/master: d2d23559857e5f34762c61487f8ffb2fa4d7442d diff --git a/trunk/drivers/input/misc/hp_sdc_rtc.c b/trunk/drivers/input/misc/hp_sdc_rtc.c index 216a559f55ea..4d1aa9a2c336 100644 --- a/trunk/drivers/input/misc/hp_sdc_rtc.c +++ b/trunk/drivers/input/misc/hp_sdc_rtc.c @@ -35,7 +35,6 @@ #include #include -#include #include #include #include @@ -409,7 +408,6 @@ 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) { - cycle_kernel_lock(); return 0; }