aboutsummaryrefslogtreecommitdiffstats
path: root/arch/i386/pci/fixup.c
diff options
context:
space:
mode:
authorRoland Dreier <rolandd@cisco.com>2005-10-29 00:50:35 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-02 00:27:22 -0500
commit1d373741976985bc665e75aeb2b3bf7a524e36cc (patch)
tree6329906126179b0513a86c748cad2989e5812e57 /arch/i386/pci/fixup.c
parentdf70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff)
[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>
Diffstat (limited to 'arch/i386/pci/fixup.c')
-rw-r--r--arch/i386/pci/fixup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c
index 330fd2b68075..3984226a8b98 100644
--- a/arch/i386/pci/fixup.c
+++ b/arch/i386/pci/fixup.c
@@ -398,7 +398,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_video);
398 */ 398 */
399static u16 toshiba_line_size; 399static u16 toshiba_line_size;
400 400
401static struct dmi_system_id __devinit toshiba_ohci1394_dmi_table[] = { 401static struct dmi_system_id __devinitdata toshiba_ohci1394_dmi_table[] = {
402 { 402 {
403 .ident = "Toshiba PS5 based laptop", 403 .ident = "Toshiba PS5 based laptop",
404 .matches = { 404 .matches = {