Merge tag 'soc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[linux-2.6-block.git] / arch / arm / mach-omap2 / pdata-quirks.c

diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c
index 5fea34edb607e14219627f18c0718a2ac19a69bc..0a5e6e053b8c1fbd3b9f072fb77f2d1f9dada3ad 100644 (file)
--- a/arch/arm/mach-omap2/pdata-quirks.c
+++ b/arch/arm/mach-omap2/pdata-quirks.c
@@ -244,8 +244,8 @@ static void __init nokia_n900_legacy_init(void)
                        /* set IBE to 1 */
                        rx51_secure_update_aux_cr(BIT(6), 0);
                } else {
-                       pr_warning("RX-51: Not enabling ARM errata 430973 workaround\n");
-                       pr_warning("Thumb binaries may crash randomly without this workaround\n");
+                       pr_warn("RX-51: Not enabling ARM errata 430973 workaround\n");
+                       pr_warn("Thumb binaries may crash randomly without this workaround\n");
                }
 
                pr_info("RX-51: Registring OMAP3 HWRNG device\n");
@@ -415,7 +415,7 @@ static void pdata_quirks_check(struct pdata_init *quirks)
        }
 }
 
-void __init pdata_quirks_init(struct of_device_id *omap_dt_match_table)
+void __init pdata_quirks_init(const struct of_device_id *omap_dt_match_table)
 {
        omap_sdrc_init(NULL, NULL);
        pdata_quirks_check(auxdata_quirks);