On Wed, 04 Dec 2013, Lv Zheng <lv.zheng@xxxxxxxxx> wrote:
> diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile
> index 41838ea..d4ae48b 100644
> --- a/drivers/gpu/drm/i915/Makefile
> +++ b/drivers/gpu/drm/i915/Makefile
> @@ -38,7 +38,6 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
> intel_ringbuffer.o \
> intel_overlay.o \
> intel_sprite.o \
> - intel_opregion.o \
> intel_sideband.o \
> intel_uncore.o \
> dvo_ch7xxx.o \
> @@ -51,7 +50,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \
>
> i915-$(CONFIG_COMPAT) += i915_ioc32.o
>
> -i915-$(CONFIG_ACPI) += intel_acpi.o
> +i915-$(CONFIG_ACPI) += intel_acpi.o intel_opregion.o
>
> i915-$(CONFIG_DRM_I915_FBDEV) += intel_fbdev.o
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index ccdbecc..7f37b83 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2336,8 +2336,8 @@ extern void intel_i2c_reset(struct drm_device *dev);
>
> /* intel_opregion.c */
> struct intel_encoder;
> -extern int intel_opregion_setup(struct drm_device *dev);
> #ifdef CONFIG_ACPI
> +extern int intel_opregion_setup(struct drm_device *dev);
> extern void intel_opregion_init(struct drm_device *dev);
> extern void intel_opregion_fini(struct drm_device *dev);
> extern void intel_opregion_asle_intr(struct drm_device *dev);
> @@ -2346,6 +2346,7 @@ extern int intel_opregion_notify_encoder(struct intel_encoder *intel_encoder,
> extern int intel_opregion_notify_adapter(struct drm_device *dev,
> pci_power_t state);
> #else
> +static inline int intel_opregion_setup(struct drm_device *dev) { return 0; }
> static inline void intel_opregion_init(struct drm_device *dev) { return; }
> static inline void intel_opregion_fini(struct drm_device *dev) { return; }
> static inline void intel_opregion_asle_intr(struct drm_device *dev) { return; }
FWIW, the above i915 specific hunks are
Reviewed-by: Jani Nikula <jani.nikula@xxxxxxxxx>
Nuking the CONFIG_ACPI conditional build within intel_opregion.c is an
obvious follow-up patch later on.
--
Jani Nikula, Intel Open Source Technology Center
--
To unsubscribe from this list: send the line "unsubscribe linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
