Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / kernel / legacy_serial.c

diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 936258881c98ccaee684998a3d05b2485c7fce0c..7b750c4ed5c73a5a1e7a4dfa8aa2e6055ae933d3 100644 (file)
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -35,7 +35,7 @@ static struct legacy_serial_info {
        phys_addr_t                     taddr;
 } legacy_serial_infos[MAX_LEGACY_SERIAL_PORTS];
 
-static struct of_device_id legacy_serial_parents[] __initdata = {
+static const struct of_device_id legacy_serial_parents[] __initconst = {
        {.type = "soc",},
        {.type = "tsi-bridge",},
        {.type = "opb", },