Merge branch 'for-2.6.21' of master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart (0bce0b7a) · Commits · 戴 / test

drivers/char/agp/intel-agp.c

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -431,9 +431,8 @@ static void intel_i830_init_gtt_entries(void)

	if (IS_I965) {		if (IS_I965) {
	u32 pgetbl_ctl;		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,		/* The 965 has a field telling us the size of the GTT,
	* which may be larger than what is necessary to map the		* which may be larger than what is necessary to map the
	* aperture.		* aperture.