projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'akpm' (fixes from Andrew)
[linux-drm-fsl-dcu.git]
/
drivers
/
rtc
/
rtc-88pm860x.c
diff --git
a/drivers/rtc/rtc-88pm860x.c
b/drivers/rtc/rtc-88pm860x.c
index 4e30c85728e5078b7b635c5bc7be4c2eaa4b3476..816504846cdda92fa97aa4f2dcae5f98953443bf 100644
(file)
--- a/
drivers/rtc/rtc-88pm860x.c
+++ b/
drivers/rtc/rtc-88pm860x.c
@@
-316,7
+316,7
@@
static int pm860x_rtc_probe(struct platform_device *pdev)
unsigned long ticks = 0;
int ret;
- pdata =
pdev->dev.platform_data
;
+ pdata =
dev_get_platdata(&pdev->dev)
;
info = devm_kzalloc(&pdev->dev, sizeof(struct pm860x_rtc_info),
GFP_KERNEL);