Commit 5b94f675 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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.
parents d12db0b0 d679f805

drivers/scsi/esp_scsi.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/video/sunxvr2500.c

+8 −8
Original line number Diff line number Diff line
@@ -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, }

};