Commit dab14d6c authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://linux-dj.bkbits.net/agpgart

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 4cdcb881 f6c1a84d
......@@ -416,7 +416,7 @@ static void intel_i830_init_gtt_entries(void)
case I915_GMCH_GMS_STOLEN_48M:
/* Check it's really I915G */
if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB)
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)
gtt_entries = MB(48) - KB(size);
else
gtt_entries = 0;
......@@ -424,7 +424,7 @@ static void intel_i830_init_gtt_entries(void)
case I915_GMCH_GMS_STOLEN_64M:
/* Check it's really I915G */
if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB ||
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB)
agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB)
gtt_entries = MB(64) - KB(size);
else
gtt_entries = 0;
......
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