diff options
| author | Marc Kleine-Budde | 2012-10-04 16:22:13 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde | 2012-10-04 19:26:32 +0200 |
| commit | 8cf437a0dc2acacb4efa5eb73af9067bba3d2232 (patch) | |
| tree | 650115e11e4a2204d54bda9710c2fa3849dfe6d1 /net/nfc/llcp/sock.c | |
| parent | can: peak_pcmcia: fix error return code (diff) | |
| download | kernel-qcow2-linux-8cf437a0dc2acacb4efa5eb73af9067bba3d2232.tar.gz kernel-qcow2-linux-8cf437a0dc2acacb4efa5eb73af9067bba3d2232.tar.xz kernel-qcow2-linux-8cf437a0dc2acacb4efa5eb73af9067bba3d2232.zip | |
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 <u.kleine-koenig@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Diffstat (limited to 'net/nfc/llcp/sock.c')
0 files changed, 0 insertions, 0 deletions