From 69c304238afb1bac00819a7a473bbf52cf7c20c7 Mon Sep 17 00:00:00 2001
From: "Antonino A. Daplas" <adaplas@gmail.com>
Date: Sat, 11 Feb 2006 17:56:07 -0800
Subject: [PATCH] --- yaml --- r: 20223 b: refs/heads/master c:
 bc7fc0601b3eb2254f080492f3fd69e319ed32d0 h: refs/heads/master i:   20221:
 ba33485e12136e2ef494231f719abe4537713fc3   20219:
 7acb72c7c51f9d30d0f6a941779a2fc4ccac6358   20215:
 733025e577af3882883d197c8bad579007c2cbfd   20207:
 df612be416089645563f5883ab9b386d19344a1e   20191:
 3fd877b4cc783587707e5ac37845065eb7ee6a29   20159:
 f08ec957f0f0efd60069bcec4c877716c5ad273a   20095:
 a6c425eb6568095bd8a1986de7d7d399c15824f7   19967:
 2ae24708c9a70301c6f6e424c2f144f4ee911f14 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/video/nvidia/nvidia.c | 2 ++
 trunk/include/linux/pci_ids.h       | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index cd20f094e68a..6eec554481d9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 891e5e5edaf13216f9f4c2710aebd066b1d98583
+refs/heads/master: bc7fc0601b3eb2254f080492f3fd69e319ed32d0
diff --git a/trunk/drivers/video/nvidia/nvidia.c b/trunk/drivers/video/nvidia/nvidia.c
index dbcb8962e57d..a7c4e5e8ead6 100644
--- a/trunk/drivers/video/nvidia/nvidia.c
+++ b/trunk/drivers/video/nvidia/nvidia.c
@@ -138,6 +138,8 @@ static struct pci_device_id nvidiafb_pci_tbl[] = {
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
+	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000,
+	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO,
 	 PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0},
 	{PCI_VENDOR_ID_NVIDIA, PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO,
diff --git a/trunk/include/linux/pci_ids.h b/trunk/include/linux/pci_ids.h
index 7a61ccdcbc4b..82b83da25d77 100644
--- a/trunk/include/linux/pci_ids.h
+++ b/trunk/include/linux/pci_ids.h
@@ -1087,6 +1087,7 @@
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440_8X 0x0181
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_440SE_8X 0x0182
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_420_8X 0x0183
+#define PCI_DEVICE_ID_NVIDIA_GEFORCE4_MX_4000   0x0185
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_448_GO    0x0186
 #define PCI_DEVICE_ID_NVIDIA_GEFORCE4_488_GO    0x0187
 #define PCI_DEVICE_ID_NVIDIA_QUADRO4_580_XGL    0x0188