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 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/keith...
[pandora-kernel.git]
/
drivers
/
rtc
/
rtc-pl031.c
diff --git
a/drivers/rtc/rtc-pl031.c
b/drivers/rtc/rtc-pl031.c
index
d829ea6
..
ff1b84b
100644
(file)
--- a/
drivers/rtc/rtc-pl031.c
+++ b/
drivers/rtc/rtc-pl031.c
@@
-307,7
+307,7
@@
static int pl031_remove(struct amba_device *adev)
return 0;
}
-static int pl031_probe(struct amba_device *adev, struct amba_id *id)
+static int pl031_probe(struct amba_device *adev,
const
struct amba_id *id)
{
int ret;
struct pl031_local *ldata;