diff options
| author | Roland Dreier <rolandd@cisco.com> | 2005-10-28 21:50:35 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-01 21:27:22 -0800 |
| commit | 1d373741976985bc665e75aeb2b3bf7a524e36cc (patch) | |
| tree | 6329906126179b0513a86c748cad2989e5812e57 /arch/i386/pci | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
| download | kernel_samsung_aries-1d373741976985bc665e75aeb2b3bf7a524e36cc.zip kernel_samsung_aries-1d373741976985bc665e75aeb2b3bf7a524e36cc.tar.gz kernel_samsung_aries-1d373741976985bc665e75aeb2b3bf7a524e36cc.tar.bz2 | |
[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')
| -rw-r--r-- | arch/i386/pci/fixup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/i386/pci/fixup.c b/arch/i386/pci/fixup.c index 330fd2b..3984226 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); */ 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 = { |