From de9f0cf93fcbccc2de4e6bcb5ef90f997616be3b Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Mon, 7 May 2007 14:02:51 -0700 Subject: [PATCH 1/2] [VIDEO] sunxvr2500: Fix PCI device ID table. Noticed by Meelis Roos. Signed-off-by: David S. Miller --- drivers/video/sunxvr2500.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c index 4010492c6920..4316c7fe8e21 100644 --- a/drivers/video/sunxvr2500.c +++ b/drivers/video/sunxvr2500.c @@ -237,14 +237,14 @@ static void __devexit s3d_pci_unregister(struct pci_dev *pdev) } static struct pci_device_id s3d_pci_table[] = { - { /* XVR-2500 */ - PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032), - .driver_data = 1, - }, - { /* XVR-500 */ - PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x07a2), - .driver_data = 0, - }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002c), }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002d), }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002e), }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002f), }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0030), }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0031), }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032), }, + { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0033), }, { 0, } }; From d679f805e7d16291f7671710dd42522561a46611 Mon Sep 17 00:00:00 2001 From: Martin Habets Date: Mon, 7 May 2007 14:05:03 -0700 Subject: [PATCH 2/2] [SCSI] esp_scsi: Fix section mismatch warnings. Signed-off-by: Martin Habets Signed-off-by: David S. Miller --- drivers/scsi/esp_scsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c index 99ce03331b64..ec71061aef61 100644 --- a/drivers/scsi/esp_scsi.c +++ b/drivers/scsi/esp_scsi.c @@ -2212,7 +2212,7 @@ static void __devinit esp_init_swstate(struct esp *esp) } /* This places the ESP into a known state at boot time. */ -static void __devinit esp_bootup_reset(struct esp *esp) +static void esp_bootup_reset(struct esp *esp) { u8 val;