These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / arch / arm / mach-at91 / at91sam9.c

diff --git a/kernel/arch/arm/mach-at91/at91sam9.c b/kernel/arch/arm/mach-at91/at91sam9.c
index e47a209..cada2a6 100644 (file)
--- a/kernel/arch/arm/mach-at91/at91sam9.c
+++ b/kernel/arch/arm/mach-at91/at91sam9.c
@@ -62,8 +62,6 @@ static void __init at91sam9_common_init(void)
                soc_dev = soc_device_to_device(soc);
 
        of_platform_populate(NULL, of_default_bus_match_table, NULL, soc_dev);
-
-       arm_pm_idle = at91sam9_idle;
 }
 
 static void __init at91sam9_dt_device_init(void)
@@ -72,7 +70,7 @@ static void __init at91sam9_dt_device_init(void)
        at91sam9260_pm_init();
 }
 
-static const char *at91_dt_board_compat[] __initconst = {
+static const char *const at91_dt_board_compat[] __initconst = {
        "atmel,at91sam9",
        NULL
 };
@@ -89,7 +87,7 @@ static void __init at91sam9g45_dt_device_init(void)
        at91sam9g45_pm_init();
 }
 
-static const char *at91sam9g45_board_compat[] __initconst = {
+static const char *const at91sam9g45_board_compat[] __initconst = {
        "atmel,at91sam9g45",
        NULL
 };
@@ -106,7 +104,7 @@ static void __init at91sam9x5_dt_device_init(void)
        at91sam9x5_pm_init();
 }
 
-static const char *at91sam9x5_board_compat[] __initconst = {
+static const char *const at91sam9x5_board_compat[] __initconst = {
        "atmel,at91sam9x5",
        "atmel,at91sam9n12",
        NULL