2005-03-06 23:49:32

by Yoichi Yuasa

[permalink] [raw]
Subject: [PATCH 2.6.11-mm1] mips: fix section type conflict about mpc30x

This patch fixes section type conflict about mpc30x

CC arch/mips/pci/fixup-mpc30x.o
arch/mips/pci/fixup-mpc30x.c:26: error: internal_func_irqs causes a section type conflict
make[1]: *** [arch/mips/pci/fixup-mpc30x.o] Error 1
make: *** [arch/mips/pci] Error 2

Yoichi

Signed-off-by: Yoichi Yuasa <[email protected]>

diff -urN -X dontdiff a-orig/arch/mips/pci/fixup-mpc30x.c a/arch/mips/pci/fixup-mpc30x.c
--- a-orig/arch/mips/pci/fixup-mpc30x.c Fri Nov 5 00:42:26 2004
+++ a/arch/mips/pci/fixup-mpc30x.c Mon Jan 10 23:54:09 2005
@@ -29,7 +29,7 @@
VRC4173_USB_IRQ,
};

-static char irq_tab_mpc30x[] __initdata = {
+static const int irq_tab_mpc30x[] __initdata = {
[12] = VRC4173_PCMCIA1_IRQ,
[13] = VRC4173_PCMCIA2_IRQ,
[29] = MQ200_IRQ,