• Marc Kleine-Budde's avatar
    can: mpc5xxx_can: fix section type conflict · 8cf437a0
    Marc Kleine-Budde authored
    Since commit:
        6d99c4c5 can: mpc5xxx_can: make data used as *of_device_id.data const
    
    both "struct mpc5xxx_can_data mpc5200_can_data" and "mpc5121_can_data" are
    marked as "const" but also as "__devinitdata". This leads to the following
    compile error:
    
    drivers/net/can/mscan/mpc5xxx_can.c:383: error: mpc5200_can_data causes a section type conflict
    drivers/net/can/mscan/mpc5xxx_can.c:383: error: mpc5200_can_data causes a section type conflict
    drivers/net/can/mscan/mpc5xxx_can.c:388: error: mpc5121_can_data causes a section type conflict
    drivers/net/can/mscan/mpc5xxx_can.c:388: error: mpc5121_can_data causes a section type conflict
    
    This patch changes the "__devinitdata" to "__devinitconst" and marks the
    "struct of_device_id mpc5xxx_can_table" as "const" and "__devinitconst", too.
    Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
    Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
    Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
    8cf437a0
mpc5xxx_can.c 11.2 KB