Merge branches 'defcfg', 'drivers' and 'cyberpro-next' of master.kernel.org:/home...

[~andy/linux] / drivers / rtc / rtc-pl030.c

diff --git a/drivers/rtc/rtc-pl030.c b/drivers/rtc/rtc-pl030.c
index d554368c9f577dfc8c9a3d1d57f706543b460ad0..1d28d4451dae548b26e6bdffb2d22e3dbb062fd7 100644 (file)
--- a/drivers/rtc/rtc-pl030.c
+++ b/drivers/rtc/rtc-pl030.c
@@ -97,7 +97,7 @@ static const struct rtc_class_ops pl030_ops = {
        .set_alarm      = pl030_set_alarm,
 };
 
-static int pl030_probe(struct amba_device *dev, struct amba_id *id)
+static int pl030_probe(struct amba_device *dev, const struct amba_id *id)
 {
        struct pl030_rtc *rtc;
        int ret;