diff options
| author | Dave Airlie <airlied@redhat.com> | 2013-11-13 18:52:44 -0500 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2013-11-13 18:52:44 -0500 |
| commit | b95b49168fc53d1fe5cf0dd4c5e89e927980f9ad (patch) | |
| tree | fc55b1aad2b8384934b593f8b23da1bf50972442 /drivers/gpu/drm/i915 | |
| parent | 792e6a6cb2314005483ca5922082e1f4ae2721b2 (diff) | |
| parent | 1dca220b2b6ba605bff07c4d019dd2cd2d70036c (diff) | |
Merge tag 'drm-intel-fixes-2013-11-12' of git://people.freedesktop.org/~danvet/drm-intel into drm-next
Just one patch to fix compile fail for CONFIG_ACPI=n. Figured I better
send this out quickly to minimize the broken build span. Otherwise no
bugfixes (besides some bdw stuff) anywhere in sight.
* tag 'drm-intel-fixes-2013-11-12' of git://people.freedesktop.org/~danvet/drm-intel:
drm/i915/opregion: fix build error on CONFIG_ACPI=n
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_opregion.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c index 91b68dca0641..1b2f41c3f191 100644 --- a/drivers/gpu/drm/i915/intel_opregion.c +++ b/drivers/gpu/drm/i915/intel_opregion.c | |||
| @@ -876,7 +876,9 @@ int intel_opregion_setup(struct drm_device *dev) | |||
| 876 | return -ENOTSUPP; | 876 | return -ENOTSUPP; |
| 877 | } | 877 | } |
| 878 | 878 | ||
| 879 | #ifdef CONFIG_ACPI | ||
| 879 | INIT_WORK(&opregion->asle_work, asle_work); | 880 | INIT_WORK(&opregion->asle_work, asle_work); |
| 881 | #endif | ||
| 880 | 882 | ||
| 881 | base = acpi_os_ioremap(asls, OPREGION_SIZE); | 883 | base = acpi_os_ioremap(asls, OPREGION_SIZE); |
| 882 | if (!base) | 884 | if (!base) |