OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Linus Torvalds 2007-05-07 17:35:42 -07:00
parent d12db0b08f d679f805e7
commit 5b94f675f5
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/scsi/esp_scsi.c
View File

@ -2212,7 +2212,7 @@ static void __devinit esp_init_swstate(struct esp *esp)
} }
/* This places the ESP into a known state at boot time. */ /* 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; u8 val;

16
drivers/video/sunxvr2500.c
View File

@ -237,14 +237,14 @@ static void __devexit s3d_pci_unregister(struct pci_dev *pdev)
} }
static struct pci_device_id s3d_pci_table[] = { static struct pci_device_id s3d_pci_table[] = {
{ /* XVR-2500 */ { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002c), },
PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032), { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002d), },
.driver_data = 1, { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002e), },
}, { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x002f), },
{ /* XVR-500 */ { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0030), },
PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x07a2), { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0031), },
.driver_data = 0, { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0032), },
}, { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x0033), },
{ 0, } { 0, }
}; };