diff options
| author | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 11:24:56 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2009-09-10 11:24:56 -0700 |
| commit | 8398535331dae39ff5f52e94a69abdbf7507a343 (patch) | |
| tree | 5e551923af0f9924d66ec8cf36e3486c8825e16f /src/mesa/drivers/dri/intel/intel_context.c | |
| parent | acfea5c705f383692e661d37c5cd7da2f3db559b (diff) | |
| parent | 2dd3da3a4a2233332219f9da60d18fec79b4b6c7 (diff) | |
Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
Conflicts:
src/mesa/drivers/dri/intel/intel_context.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_context.c')
| -rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 89f99f7ffd..2364829a1e 100644 --- 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; |