diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:17:34 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-20 15:17:34 +0200 |
| commit | a32750c2ca6f697903b19063fc86f4272865e3a1 (patch) | |
| tree | 57a23806c5358855eb426c006c88943afa683b1b /drivers/gpu/drm/i915/intel_opregion.c | |
| parent | 318007e9001349db9b4fcd49e9e79a7636dba7a9 (diff) | |
| parent | d870ea1d6bc5057f2599416655b42ab192dae6d0 (diff) | |
| download | linux-stable-a32750c2ca6f697903b19063fc86f4272865e3a1.tar.gz linux-stable-a32750c2ca6f697903b19063fc86f4272865e3a1.tar.bz2 linux-stable-a32750c2ca6f697903b19063fc86f4272865e3a1.zip | |
Merge branches 'imx/pata' and 'imx/sata' into next/driver
Conflicts:
arch/arm/mach-mx5/clock-mx51-mx53.c
arch/arm/mach-mx5/devices-imx53.h
Diffstat (limited to 'drivers/gpu/drm/i915/intel_opregion.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index b7c5ddb564d1..b8e8158bb16e 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c @@ -227,7 +227,6 @@ void intel_opregion_asle_intr(struct drm_device *dev) asle->aslc = asle_stat; } -/* Only present on Ironlake+ */ void intel_opregion_gse_intr(struct drm_device *dev) { struct drm_i915_private *dev_priv = dev->dev_private; |