Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts: src/mesa/drivers/dri/intel/intel_context.c
2009-09-10 11:24:56 -07:00
parent acfea5c705 2dd3da3a4a
commit 8398535331
2 changed files with 6 additions and 1 deletions
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -162,6 +162,9 @@ intelGetString(GLcontext * ctx, GLenum name)
      case PCI_CHIP_G41_G:
         chipset = "Intel(R) G41";
         break;
+      case PCI_CHIP_B43_G:
+         chipset = "Intel(R) B43";
+         break;
      case PCI_CHIP_ILD_G:
         chipset = "Intel(R) IGDNG_D";
         break;