From 7e873ebd95922a58e7480870a55397f8854a06ec Mon Sep 17 00:00:00 2001 From: Dave Jones Date: Sun, 10 Sep 2006 21:09:26 -0400 Subject: [PATCH] --- yaml --- r: 34377 b: refs/heads/master c: 08da3f413f6aa3eb48cfc5331c68e57393167fe5 h: refs/heads/master i: 34375: 0b172a46edefd07b97bd52fb2f0ae6187aa56cc5 v: v3 --- [refs] | 2 +- trunk/drivers/char/agp/intel-agp.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 352eea0715ce..1f737dfd1717 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c14635eb4e591c61e419c065df1fdacf9ff90c00 +refs/heads/master: 08da3f413f6aa3eb48cfc5331c68e57393167fe5 diff --git a/trunk/drivers/char/agp/intel-agp.c b/trunk/drivers/char/agp/intel-agp.c index 42c7d8dec635..d1ede7db5a12 100644 --- a/trunk/drivers/char/agp/intel-agp.c +++ b/trunk/drivers/char/agp/intel-agp.c @@ -1924,6 +1924,8 @@ static int agp_intel_resume(struct pci_dev *pdev) intel_i830_configure(); else if (bridge->driver == &intel_810_driver) intel_i810_configure(); + else if (bridge->driver == &intel_i965_driver) + intel_i915_configure(); return 0; }