From: Marc Kleine-Budde Date: Thu, 4 Oct 2012 14:22:13 +0000 (+0200) Subject: can: mpc5xxx_can: fix section type conflict X-Git-Tag: omap-for-v3.7-rc1/fixes-cpufreq-signed~11^2~2^2 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cf437a0dc2acacb4efa5eb73af9067bba3d2232;p=pandora-kernel.git can: mpc5xxx_can: fix section type conflict Since commit: 6d99c4c 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: Uwe Kleine-König Acked-by: Arnd Bergmann Signed-off-by: Marc Kleine-Budde --- Reading git-diff-tree failed