Commit 1d373741 authored by Roland Dreier's avatar Roland Dreier Committed by Linus Torvalds

[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: default avatarRoland Dreier <rolandd@cisco.com>
Acked-by: default avatarMartin J. Bligh <mbligh@mbligh.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent df70b17f
...@@ -398,7 +398,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video); ...@@ -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", .ident = "Toshiba PS5 based laptop",
.matches = { .matches = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment