public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel•com>
To: Jim Davis <jim.epost@gmail•com>,
	Stephen Rothwell <sfr@canb•auug.org.au>,
	intel-gfx@lists•freedesktop.org
Cc: jani.nikula@intel•com, linux-next@vger•kernel.org,
	linux-kernel@vger•kernel.org, daniel.vetter@ffwll•ch,
	David Airlie <airlied@linux•ie>,
	dri-devel@lists•freedesktop.org
Subject: [PATCH] drm/i915/opregion: fix build error on CONFIG_ACPI=n
Date: Fri,  8 Nov 2013 10:10:31 +0200	[thread overview]
Message-ID: <1383898231-23234-1-git-send-email-jani.nikula@intel.com> (raw)
In-Reply-To: <CA+r1ZhjcFpr5KKVX0pLCOP8cAyZoiYO=UyqYMJtNSV-Kt_p7xQ@mail.gmail.com>

Fix CONFIG_ACPI=n build fail

  CC      drivers/gpu/drm/i915/intel_opregion.o
drivers/gpu/drm/i915/intel_opregion.c: In function ‘intel_opregion_setup’:
drivers/gpu/drm/i915/intel_opregion.c:879:2: error: ‘asle_work’ undeclared (first use in this function)
drivers/gpu/drm/i915/intel_opregion.c:879:2: note: each undeclared identifier is reported only once for each function it appears in
make[4]: *** [drivers/gpu/drm/i915/intel_opregion.o] Error 1

introduced in
commit 91a60f20712179e56b7a6c3d332a5f6f9a54aa11
Author: Jani Nikula <jani.nikula@intel•com>
Date:   Thu Oct 31 18:55:48 2013 +0200

    drm/i915: move opregion asle request handling to a work queue

Reported-by: Jim Davis <jim.epost@gmail•com>
Reference: http://lkml.kernel.org/r/CA+r1ZhjcFpr5KKVX0pLCOP8cAyZoiYO=UyqYMJtNSV-Kt_p7xQ@mail.gmail.com
Signed-off-by: Jani Nikula <jani.nikula@intel•com>
---
 drivers/gpu/drm/i915/intel_opregion.c |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/intel_opregion.c b/drivers/gpu/drm/i915/intel_opregion.c
index 91b68dc..1b2f41c 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)
 		return -ENOTSUPP;
 	}
 
+#ifdef CONFIG_ACPI
 	INIT_WORK(&opregion->asle_work, asle_work);
+#endif
 
 	base = acpi_os_ioremap(asls, OPREGION_SIZE);
 	if (!base)
-- 
1.7.9.5

  reply	other threads:[~2013-11-08  8:08 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-07 18:30 randconfig build error with next-20131107, in drivers/gpu/drm/i915 Jim Davis
2013-11-08  8:10 ` Jani Nikula [this message]
2013-11-08 18:33   ` [PATCH] drm/i915/opregion: fix build error on CONFIG_ACPI=n Daniel Vetter

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1383898231-23234-1-git-send-email-jani.nikula@intel.com \
    --to=jani.nikula@intel$(echo .)com \
    --cc=airlied@linux$(echo .)ie \
    --cc=daniel.vetter@ffwll$(echo .)ch \
    --cc=dri-devel@lists$(echo .)freedesktop.org \
    --cc=intel-gfx@lists$(echo .)freedesktop.org \
    --cc=jim.epost@gmail$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=sfr@canb$(echo .)auug.org.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox