aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHelge Deller <deller@gmx.de>2007-05-27 14:38:47 -0400
committerKyle McMartin <kyle@athena.road.mcmartin.ca>2007-05-27 15:01:19 -0400
commit8c678b101a08a6543e62ab60aace93042456aa9d (patch)
treef82dd364aaf025a5553d3b0ded189e29704e2246
parent6fe077fd381048293134fbc6011d7e4633edc0c5 (diff)
[PARISC] fix section mismatch in superio serial drivers
This patch fixes two section mismatches in superio serial setup: WARNING: drivers/built-in.o(.text.superio_serial_init+0x78): Section mismatch: reference to .init.text:early_serial_setup (after 'superio_serial_init') WARNING: drivers/built-in.o(.text.superio_serial_init+0xa4): Section mismatch: reference to .init.text:early_serial_setup (after 'superio_serial_init') Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
-rw-r--r--drivers/parisc/superio.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/parisc/superio.c b/drivers/parisc/superio.c
index 1fd97f7c8b98..a708c329675e 100644
--- a/drivers/parisc/superio.c
+++ b/drivers/parisc/superio.c
@@ -389,7 +389,7 @@ int superio_fixup_irq(struct pci_dev *pcidev)
389 return local_irq; 389 return local_irq;
390} 390}
391 391
392static void __devinit superio_serial_init(void) 392static void __init superio_serial_init(void)
393{ 393{
394#ifdef CONFIG_SERIAL_8250 394#ifdef CONFIG_SERIAL_8250
395 int retval; 395 int retval;
@@ -423,7 +423,7 @@ static void __devinit superio_serial_init(void)
423} 423}
424 424
425 425
426static void __devinit superio_parport_init(void) 426static void __init superio_parport_init(void)
427{ 427{
428#ifdef CONFIG_PARPORT_PC 428#ifdef CONFIG_PARPORT_PC
429 if (!parport_pc_probe_port(sio_dev.pp_base, 429 if (!parport_pc_probe_port(sio_dev.pp_base,
@@ -450,7 +450,7 @@ static void superio_fixup_pci(struct pci_dev *pdev)
450DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci); 450DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci);
451 451
452 452
453static int __devinit 453static int __init
454superio_probe(struct pci_dev *dev, const struct pci_device_id *id) 454superio_probe(struct pci_dev *dev, const struct pci_device_id *id)
455{ 455{
456 struct superio_device *sio = &sio_dev; 456 struct superio_device *sio = &sio_dev;
@@ -485,7 +485,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id)
485 return -ENODEV; 485 return -ENODEV;
486} 486}
487 487
488static struct pci_device_id superio_tbl[] = { 488static const struct pci_device_id superio_tbl[] = {
489 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO) }, 489 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO) },
490 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_USB) }, 490 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_USB) },
491 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415) }, 491 { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415) },