[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)
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

index 330fd2b6807574afd159e968fbf7b043c978a2af..3984226a8b98f432ec83a1222c4701a671de01e5 100644 (file)
@@ -398,7 +398,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
  */
 static u16 toshiba_line_size;
 
  */
 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 = {
        {
                .ident = "Toshiba PS5 based laptop",
                .matches = {