]> err.no Git - linux-2.6/commit
[PATCH] toshiba_ohci1394_dmi_table should be __devinitdata, not __devinit
authorRoland Dreier <rolandd@cisco.com>
Sat, 29 Oct 2005 04:50:35 +0000 (21:50 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 2 Nov 2005 05:27:22 +0000 (21:27 -0800)
commit1d373741976985bc665e75aeb2b3bf7a524e36cc
tree6329906126179b0513a86c748cad2989e5812e57
parentdf70b17f88a4d1d8545d3569a1f6d28c6004f9e4
[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>
arch/i386/pci/fixup.c