Commit 1d373741 authored Oct 28, 2005 by Roland Dreier Committed by Linus Torvalds Nov 01, 2005

[PATCH] toshiba_ohci1394_dmi_table should be devinitdata, not devinit



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.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
Acked-by: Martin J. Bligh <mbligh@mbligh.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

parent df70b17f

arch/i386/pci/fixup.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -398,7 +398,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
		*/
		static u16 toshiba_line_size;

		static struct dmi_system_id __devinit toshiba_ohci1394_dmi_table[] = {
		static struct dmi_system_id __devinitdata toshiba_ohci1394_dmi_table[] = {
		{
		.ident = "Toshiba PS5 based laptop",
		.matches = {

Admin message