]> err.no Git - linux-2.6/commitdiff
[POWERPC] char/xilinx_hwicap/ section fix
authorAdrian Bunk <bunk@kernel.org>
Wed, 23 Apr 2008 09:51:38 +0000 (19:51 +1000)
committerPaul Mackerras <paulus@samba.org>
Thu, 24 Apr 2008 10:58:02 +0000 (20:58 +1000)
This patch fixes the following build error:

<--  snip  -->

...
  CC [M]  drivers/char/xilinx_hwicap/xilinx_hwicap.o
...
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c:806: error: hwicap_of_match causes a section type conflict
/home/bunk/linux/kernel-2.6/git/linux-2.6/drivers/char/xilinx_hwicap/xilinx_hwicap.c:806: error: hwicap_of_match causes a section type conflict
make[4]: *** [drivers/char/xilinx_hwicap/xilinx_hwicap.o] Error 1

<--  snip  -->

Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/char/xilinx_hwicap/xilinx_hwicap.c

index 016f90567a5200eb27c7a3baf095972f68529cbb..dfe6907ae15be44641591f4c28fea94d1a4e66f6 100644 (file)
@@ -803,7 +803,7 @@ static int __devexit hwicap_of_remove(struct of_device *op)
 }
 
 /* Match table for of_platform binding */
-static const struct of_device_id __devinit hwicap_of_match[] = {
+static const struct of_device_id __devinitconst hwicap_of_match[] = {
        { .compatible = "xlnx,opb-hwicap-1.00.b", .data = &buffer_icap_config},
        { .compatible = "xlnx,xps-hwicap-1.00.a", .data = &fifo_icap_config},
        {},