mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Sasha Levin <levinsasha928@gmail.com>
To: airlied@linux.ie, alan@linux.intel.com, kirill.shutemov@linux.intel.com
Cc: airlied@redhat.com, dri-devel@lists.freedesktop.org,
	linux-kernel@vger.kernel.org,
	Sasha Levin <levinsasha928@gmail.com>
Subject: [PATCH] gma500: fix build when ACPI isn't set
Date: Fri, 11 May 2012 06:39:02 +0200	[thread overview]
Message-ID: <1336711142-26788-1-git-send-email-levinsasha928@gmail.com> (raw)

Signed-off-by: Sasha Levin <levinsasha928@gmail.com>
---
 drivers/gpu/drm/gma500/opregion.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/drivers/gpu/drm/gma500/opregion.c b/drivers/gpu/drm/gma500/opregion.c
index 05661bf..e2fbf4d 100644
--- a/drivers/gpu/drm/gma500/opregion.c
+++ b/drivers/gpu/drm/gma500/opregion.c
@@ -258,6 +258,7 @@ void psb_intel_opregion_init(struct drm_device *dev)
 	if (!opregion->header)
 		return;
 
+#ifdef CONFIG_ACPI
 	if (opregion->acpi) {
 		/* Notify BIOS we are ready to handle ACPI video ext notifs.
 		 * Right now, all the events are handled by the ACPI video
@@ -268,6 +269,7 @@ void psb_intel_opregion_init(struct drm_device *dev)
 		system_opregion = opregion;
 		register_acpi_notifier(&psb_intel_opregion_notifier);
 	}
+#endif
 
 	if (opregion->asle)
 		psb_intel_opregion_enable_asle(dev);
@@ -281,12 +283,14 @@ void psb_intel_opregion_fini(struct drm_device *dev)
 	if (!opregion->header)
 		return;
 
+#ifdef CONFIG_ACPI
 	if (opregion->acpi) {
 		opregion->acpi->drdy = 0;
 
 		system_opregion = NULL;
 		unregister_acpi_notifier(&psb_intel_opregion_notifier);
 	}
+#endif
 
 	/* just clear all opregion memory pointers now */
 	iounmap(opregion->header);
-- 
1.7.8.5


             reply	other threads:[~2012-05-11  4:38 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-11  4:39 Sasha Levin [this message]
2012-05-11  9:43 ` Alan Cox
2012-05-11  9:49   ` Sasha Levin
2012-05-11 10:01     ` Alan Cox

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=1336711142-26788-1-git-send-email-levinsasha928@gmail.com \
    --to=levinsasha928@gmail.com \
    --cc=airlied@linux.ie \
    --cc=airlied@redhat.com \
    --cc=alan@linux.intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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

all inboxes | Powered by JetHome®