Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/…

…git/davej/agpgart * 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart: [AGPGART] intel_agp: fix G965 GTT size detect
mariux64 · Apr 11, 2007 · 0bce0b7 · 0bce0b7
2 parents c3474be + 52ea071
commit 0bce0b7
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
@@ -431,9 +431,8 @@ static void intel_i830_init_gtt_entries(void)
 
 	if (IS_I965) {
 		u32 pgetbl_ctl;
+		pgetbl_ctl = readl(intel_i830_private.registers+I810_PGETBL_CTL);
 
-		pci_read_config_dword(agp_bridge->dev, I810_PGETBL_CTL,
-				      &pgetbl_ctl);
 		/* The 965 has a field telling us the size of the GTT,
 		 * which may be larger than what is necessary to map the
 		 * aperture.