Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel

* 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel:
  drm/i915/lvds: Add AOpen i915GMm-HFS to the list of false-positive LVDS
  agp/intel: Fix device names of i845 and 845G
  drm/i915: Disable GPU semaphores on SandyBridge mobile
  drm/i915/execbuffer: Clear domains before beginning reloc processing
  drm/i915/execbuffer: Reorder relocations to match new object order
  drm/i915: Fix error handler to capture the first batch after the seqno
  drm/i915: Add a module option to override the use of SSC
  drm/i915/panel: The backlight is enabled if the current value is non-zero
  drm/i915/debugfs: Correct format after changing type of err object 'size'

2 files changed, 3 insertions, 3 deletions

diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
index 07e9796fead7..857df10c0428 100644
--- a/drivers/char/agp/intel-agp.c
+++ b/drivers/char/agp/intel-agp.c
@@ -717,8 +717,8 @@ static const struct intel_agp_driver_description {
         { PCI_DEVICE_ID_INTEL_82820_UP_HB, "i820", &intel_820_driver },
         { PCI_DEVICE_ID_INTEL_82830_HB, "830M", &intel_830mp_driver },
         { PCI_DEVICE_ID_INTEL_82840_HB, "i840", &intel_840_driver },
-        { PCI_DEVICE_ID_INTEL_82845_HB, "845G", &intel_845_driver },
-        { PCI_DEVICE_ID_INTEL_82845G_HB, "830M", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82845_HB, "i845", &intel_845_driver },
+        { PCI_DEVICE_ID_INTEL_82845G_HB, "845G", &intel_845_driver },
         { PCI_DEVICE_ID_INTEL_82850_HB, "i850", &intel_850_driver },
         { PCI_DEVICE_ID_INTEL_82854_HB, "854", &intel_845_driver },
         { PCI_DEVICE_ID_INTEL_82855PM_HB, "855PM", &intel_845_driver },
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c
index e921b693412b..826ab0939a12 100644
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
@@ -1361,7 +1361,7 @@ static const struct intel_gtt_driver_description {
                 &i81x_gtt_driver},
         { PCI_DEVICE_ID_INTEL_82830_CGC, "830M",
                 &i8xx_gtt_driver},
-        { PCI_DEVICE_ID_INTEL_82845G_IG, "830M",
+        { PCI_DEVICE_ID_INTEL_82845G_IG, "845G",
                 &i8xx_gtt_driver},
         { PCI_DEVICE_ID_INTEL_82854_IG, "854",
                 &i8xx_gtt_driver},