diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 07:56:44 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-02 07:56:44 -0800 |
| commit | b7f3a209e9b09b3110ea084836c75f2cd26b29f2 (patch) | |
| tree | b5f77cb3f2eab58a2a2f3705fdd08bd39ea02a3f /drivers/video | |
| parent | 6d6b89bd2e316b78d668f761d380837b81fa71ef (diff) | |
| parent | 4b17764737bb4ee3364b8bfa2059f51ebc19ccd6 (diff) | |
| download | linux-3.10-b7f3a209e9b09b3110ea084836c75f2cd26b29f2.tar.gz linux-3.10-b7f3a209e9b09b3110ea084836c75f2cd26b29f2.tar.bz2 linux-3.10-b7f3a209e9b09b3110ea084836c75f2cd26b29f2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next-2.6:
sparc: Support show_unhandled_signals.
sparc: use __ratelimit
sunxvr500: Additional PCI id for sunxvr500 driver
sparc: use asm-generic/scatterlist.h
sparc64: If 'slot-names' property exist, create sysfs PCI slot information.
sparc: remove trailing space in messages
sparc: remove redundant return statements
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/sunxvr500.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/sunxvr500.c b/drivers/video/sunxvr500.c index 18b950706ca..4cd50497264 100644 --- a/drivers/video/sunxvr500.c +++ b/drivers/video/sunxvr500.c @@ -400,6 +400,7 @@ static void __devexit e3d_pci_unregister(struct pci_dev *pdev) static struct pci_device_id e3d_pci_table[] = { { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a0), }, + { PCI_DEVICE(0x1091, 0x7a0), }, { PCI_DEVICE(PCI_VENDOR_ID_3DLABS, 0x7a2), }, { .vendor = PCI_VENDOR_ID_3DLABS, .device = PCI_ANY_ID, |