Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-20 20:34:13 -0800
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-02-20 20:34:13 -0800
commitac87508c153b08e7ab9c25970d7542e61e8da11b (patch)
tree36eeb508b68ed28e0713aeb0d9d110f4f57751c4
parent87b62195716c493f1822ab868932a49ab361931a (diff)
parentae61cd2d6ccbc8a404861f7b9d5a0130a2787bfd (diff)
Merge http://gkernel.bkbits.net/misc-2.5
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
-rw-r--r--drivers/pci/pci.ids1
-rw-r--r--drivers/video/riva/fbdev.c2
-rw-r--r--include/linux/pci_ids.h2
3 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/pci.ids b/drivers/pci/pci.ids
index 147cffd53d61..7160e06e38fe 100644
--- a/drivers/pci/pci.ids
+++ b/drivers/pci/pci.ids
@@ -3952,6 +3952,7 @@
9511 16PCI954 Function 1
15ed 2000 Macrolink MCCR Serial p4-7 of 8
15ed 2001 Macrolink MCCR Serial p4-15 of 16
+ 9521 Oxford Semi OX16PCI952 PCI/dual 16950 UART
1416 Multiwave Innovation pte Ltd
1417 Convergenet Technologies Inc
1418 Kyushu electronics systems Inc
diff --git a/drivers/video/riva/fbdev.c b/drivers/video/riva/fbdev.c
index 72d42b197aa5..a68cc3372c80 100644
--- a/drivers/video/riva/fbdev.c
+++ b/drivers/video/riva/fbdev.c
@@ -1811,7 +1811,7 @@ static int __devinit riva_set_fbinfo(struct rivafb_info *rinfo)
info = &rinfo->info;
strcpy(info->modename, rinfo->drvr_name);
- info->node = -1;
+ info->node = NODEV;
info->flags = FBINFO_FLAG_DEFAULT;
info->fbops = &riva_fb_ops;
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 03d3d6eea25a..f1dedf17a8b1 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -1462,9 +1462,9 @@
#define PCI_VENDOR_ID_OXSEMI 0x1415
#define PCI_DEVICE_ID_OXSEMI_12PCI840 0x8403
#define PCI_DEVICE_ID_OXSEMI_16PCI954 0x9501
-#define PCI_DEVICE_ID_OXSEMI_16PCI952 0x950A
#define PCI_DEVICE_ID_OXSEMI_16PCI95N 0x9511
#define PCI_DEVICE_ID_OXSEMI_16PCI954PP 0x9513
+#define PCI_DEVICE_ID_OXSEMI_16PCI952 0x9521
#define PCI_VENDOR_ID_AIRONET 0x14b9
#define PCI_DEVICE_ID_AIRONET_4800_1 0x0001