From fdd75e424d47b120f7038c67438e380acd161c20 Mon Sep 17 00:00:00 2001 From: Helge Deller Date: Sun, 27 May 2007 20:38:47 +0200 Subject: [PATCH] --- yaml --- r: 57753 b: refs/heads/master c: 8c678b101a08a6543e62ab60aace93042456aa9d h: refs/heads/master i: 57751: d3c56905b1b7ae26787c7647bf4c280ef23126a7 v: v3 --- [refs] | 2 +- trunk/drivers/parisc/superio.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a8bc4f001907..7a6073b7fe57 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fe077fd381048293134fbc6011d7e4633edc0c5 +refs/heads/master: 8c678b101a08a6543e62ab60aace93042456aa9d diff --git a/trunk/drivers/parisc/superio.c b/trunk/drivers/parisc/superio.c index 1fd97f7c8b98..a708c329675e 100644 --- a/trunk/drivers/parisc/superio.c +++ b/trunk/drivers/parisc/superio.c @@ -389,7 +389,7 @@ int superio_fixup_irq(struct pci_dev *pcidev) return local_irq; } -static void __devinit superio_serial_init(void) +static void __init superio_serial_init(void) { #ifdef CONFIG_SERIAL_8250 int retval; @@ -423,7 +423,7 @@ static void __devinit superio_serial_init(void) } -static void __devinit superio_parport_init(void) +static void __init superio_parport_init(void) { #ifdef CONFIG_PARPORT_PC if (!parport_pc_probe_port(sio_dev.pp_base, @@ -450,7 +450,7 @@ static void superio_fixup_pci(struct pci_dev *pdev) DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415, superio_fixup_pci); -static int __devinit +static int __init superio_probe(struct pci_dev *dev, const struct pci_device_id *id) { struct superio_device *sio = &sio_dev; @@ -485,7 +485,7 @@ superio_probe(struct pci_dev *dev, const struct pci_device_id *id) return -ENODEV; } -static struct pci_device_id superio_tbl[] = { +static const struct pci_device_id superio_tbl[] = { { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_LIO) }, { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87560_USB) }, { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_87415) },