Commit b95b4916 authored Nov 14, 2013 by Dave Airlie

Merge tag 'drm-intel-fixes-2013-11-12' of...

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

parents 792e6a6c 1dca220b

drivers/gpu/drm/i915/intel_opregion.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -876,7 +876,9 @@ int intel_opregion_setup(struct drm_device *dev)
	return -ENOTSUPP;		return -ENOTSUPP;
	}		}

			#ifdef CONFIG_ACPI
	INIT_WORK(&opregion->asle_work, asle_work);		INIT_WORK(&opregion->asle_work, asle_work);
			#endif

	base = acpi_os_ioremap(asls, OPREGION_SIZE);		base = acpi_os_ioremap(asls, OPREGION_SIZE);
	if (!base)		if (!base)