Commit 65f0361a authored by Dave Jones's avatar Dave Jones Committed by Linus Torvalds

[PATCH] Fix up agpgart.

Don't know what exactly happened, but somehow, the ZX1 support is
in your tree twice. This patch drops one of them, and also adds
in Intel i845 support to make up for it 8-)
parent 4147b6ca
...@@ -172,6 +172,12 @@ struct agp_bridge_data { ...@@ -172,6 +172,12 @@ struct agp_bridge_data {
#ifndef PCI_DEVICE_ID_INTEL_810_0 #ifndef PCI_DEVICE_ID_INTEL_810_0
#define PCI_DEVICE_ID_INTEL_810_0 0x7120 #define PCI_DEVICE_ID_INTEL_810_0 0x7120
#endif #endif
#ifndef PCI_DEVICE_ID_INTEL_845_G_0
#define PCI_DEVICE_ID_INTEL_845_G_0 0x2560
#endif
#ifndef PCI_DEVICE_ID_INTEL_845_G_1
#define PCI_DEVICE_ID_INTEL_845_G_1 0x2562
#endif
#ifndef PCI_DEVICE_ID_INTEL_830_M_0 #ifndef PCI_DEVICE_ID_INTEL_830_M_0
#define PCI_DEVICE_ID_INTEL_830_M_0 0x3575 #define PCI_DEVICE_ID_INTEL_830_M_0 0x3575
#endif #endif
......
This diff is collapsed.
...@@ -48,6 +48,7 @@ enum chipset_type { ...@@ -48,6 +48,7 @@ enum chipset_type {
INTEL_I815, INTEL_I815,
INTEL_I820, INTEL_I820,
INTEL_I830_M, INTEL_I830_M,
INTEL_I845_G,
INTEL_I840, INTEL_I840,
INTEL_I845, INTEL_I845,
INTEL_I850, INTEL_I850,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment