summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 00:35:42 (GMT)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-08 00:35:42 (GMT)
commit5b94f675f57e4ff16c8fda09088d7480a84dcd91 (patch)
tree53d311c909a3f333d48ab70d93e8a9010056d498
parentd12db0b08f6c14dfd1438f6f6ad49dcd663c9ae5 (diff)
parentd679f805e7d16291f7671710dd42522561a46611 (diff)
downloadlinux-fsl-qoriq-5b94f675f57e4ff16c8fda09088d7480a84dcd91.tar.xz
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SCSI] esp_scsi: Fix section mismatch warnings. [VIDEO] sunxvr2500: Fix PCI device ID table.
-rw-r--r--drivers/scsi/esp_scsi.c2
-rw-r--r--drivers/video/sunxvr2500.c16
2 files changed, 9 insertions, 9 deletions
diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 99ce033..ec71061 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;
diff --git a/drivers/video/sunxvr2500.c b/drivers/video/sunxvr2500.c
index 4010492..4316c7f 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, }
};