diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:32 -0400 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-09-21 06:19:32 -0400 |
| commit | e9e5f8e8d373e72f5c39dafde1ce110fc7082118 (patch) | |
| tree | 2991e33571a59cc2488daef36dcfeab7bddb9d7f /drivers/char/agp/intel-gtt.c | |
| parent | f899fc64cda8569d0529452aafc0da31c042df2e (diff) | |
| parent | db8c076b9206ea35b1f7299708d5510b17674db2 (diff) | |
Merge branch 'drm-intel-fixes' into HEAD
Conflicts:
drivers/char/agp/intel-agp.c
drivers/gpu/drm/i915/intel_crt.c
Diffstat (limited to 'drivers/char/agp/intel-gtt.c')
| -rw-r--r-- | drivers/char/agp/intel-gtt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index ebdeab26ee3c..248ac5f8708e 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c | |||
| @@ -1627,6 +1627,8 @@ static const struct intel_gtt_driver_description { | |||
| 1627 | &intel_i965_driver , &g4x_gtt_driver }, | 1627 | &intel_i965_driver , &g4x_gtt_driver }, |
| 1628 | { PCI_DEVICE_ID_INTEL_B43_IG, "B43", | 1628 | { PCI_DEVICE_ID_INTEL_B43_IG, "B43", |
| 1629 | &intel_i965_driver , &g4x_gtt_driver }, | 1629 | &intel_i965_driver , &g4x_gtt_driver }, |
| 1630 | { PCI_DEVICE_ID_INTEL_B43_1_IG, "B43", | ||
| 1631 | &intel_i965_driver , &g4x_gtt_driver }, | ||
| 1630 | { PCI_DEVICE_ID_INTEL_G41_IG, "G41", | 1632 | { PCI_DEVICE_ID_INTEL_G41_IG, "G41", |
| 1631 | &intel_i965_driver , &g4x_gtt_driver }, | 1633 | &intel_i965_driver , &g4x_gtt_driver }, |
| 1632 | { PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG, | 1634 | { PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG, |