Messages in this thread Patch in this message | | | From | Jesse Barnes <> | Subject | Re: [PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinit | Date | Sat, 29 Oct 2005 07:43:59 -0700 |
| |
On Friday, October 28, 2005 9:50 pm, Roland Dreier wrote: > I don't really understand why gcc gives the error it does, but > without this patch, when building with CONFIG_HOTPLUG=n, I get errors > like: > > CC arch/x86_64/pci/../../i386/pci/fixup.o > arch/x86_64/pci/../../i386/pci/fixup.c: In function > `pci_fixup_i450nx': arch/x86_64/pci/../../i386/pci/fixup.c:13: error: > pci_fixup_i450nx causes a section type conflict > > The change is obviously correct: an array should be declared > __devinitdata rather that __devinit.
Oops, yeah I think this is correct. We should also mark toshiba_line_size as __devinitdata. Patch relative to yours.
Thanks, Jesse
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org> --- linux-2.6.14/arch/i386/pci/fixup.c.orig 2005-10-29 07:42:46.000000000 -0700 +++ linux-2.6.14/arch/i386/pci/fixup.c 2005-10-29 07:42:06.000000000 -0700 @@ -396,7 +396,7 @@ * the wrong IRQ line, causing any devices sharing the the line it's * *supposed* to use to be disabled by the kernel's IRQ debug code. */ -static u16 toshiba_line_size; +static u16 __devinitdata toshiba_line_size; static struct dmi_system_id __devinitdata toshiba_ohci1394_dmi_table[] = { { | |