projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into gfs2
[cascardo/linux.git]
/
drivers
/
rtc
/
rtc-pl031.c
diff --git
a/drivers/rtc/rtc-pl031.c
b/drivers/rtc/rtc-pl031.c
index
ee53863
..
739d1a6
100644
(file)
--- a/
drivers/rtc/rtc-pl031.c
+++ b/
drivers/rtc/rtc-pl031.c
@@
-128,7
+128,7
@@
static int pl031_set_alarm(struct device *dev, struct rtc_wkalrm *alarm)
return 0;
}
return 0;
}
-static struct rtc_class_ops pl031_ops = {
+static
const
struct rtc_class_ops pl031_ops = {
.open = pl031_open,
.release = pl031_release,
.ioctl = pl031_ioctl,
.open = pl031_open,
.release = pl031_release,
.ioctl = pl031_ioctl,
@@
-173,7
+173,7
@@
static int pl031_probe(struct amba_device *adev, void *id)
goto out_no_remap;
}
goto out_no_remap;
}
- if (request_irq(adev->irq[0], pl031_interrupt,
SA_INTERRUPT
,
+ if (request_irq(adev->irq[0], pl031_interrupt,
IRQF_DISABLED
,
"rtc-pl031", ldata->rtc)) {
ret = -EIO;
goto out_no_irq;
"rtc-pl031", ldata->rtc)) {
ret = -EIO;
goto out_no_irq;