From patchwork Fri Oct  8 15:53:35 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Matthias Hopf <mhopf@suse.de>
X-Patchwork-Id: 241571
Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o98Frqxn000993
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Fri, 8 Oct 2010 15:54:14 GMT
Received: from gabe.freedesktop.org (localhost [127.0.0.1])
	by gabe.freedesktop.org (Postfix) with ESMTP id C6BC4A0A2E
	for <patchwork-intel-gfx@patchwork.kernel.org>;
	Fri,  8 Oct 2010 08:53:50 -0700 (PDT)
X-Original-To: intel-gfx@lists.freedesktop.org
Delivered-To: intel-gfx@lists.freedesktop.org
Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15])
	by gabe.freedesktop.org (Postfix) with ESMTP id 399E19E738
	for <intel-gfx@lists.freedesktop.org>;
	Fri,  8 Oct 2010 08:53:36 -0700 (PDT)
Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.221.2])
	by mx2.suse.de (Postfix) with ESMTP id 3AAE386EE4
	for <intel-gfx@lists.freedesktop.org>;
	Fri,  8 Oct 2010 17:53:35 +0200 (CEST)
From: Matthias Hopf <mhopf@suse.de>
To: intel-gfx@lists.freedesktop.org
Date: Fri,  8 Oct 2010 17:53:35 +0200
Message-Id: <1286553215-14798-1-git-send-email-mhopf@suse.de>
X-Mailer: git-send-email 1.6.0.2
Subject: [Intel-gfx] [PATCH] Make driver compile for 1.6 Xserver series
	again. Part deux.
X-BeenThere: intel-gfx@lists.freedesktop.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Intel graphics driver community testing & development
	<intel-gfx.lists.freedesktop.org>
List-Unsubscribe: <http://lists.freedesktop.org/mailman/options/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=unsubscribe>
List-Archive: <http://lists.freedesktop.org/archives/intel-gfx>
List-Post: <mailto:intel-gfx@lists.freedesktop.org>
List-Help: <mailto:intel-gfx-request@lists.freedesktop.org?subject=help>
List-Subscribe: <http://lists.freedesktop.org/mailman/listinfo/intel-gfx>,
	<mailto:intel-gfx-request@lists.freedesktop.org?subject=subscribe>
MIME-Version: 1.0
Sender: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
Errors-To: 
 intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]);
	Fri, 08 Oct 2010 15:54:14 +0000 (UTC)


diff --git a/src/common.h b/src/common.h
index 6f23cdd..800e17f 100644
--- a/src/common.h
+++ b/src/common.h
@@ -172,6 +172,11 @@ static inline void memcpy_volatile(volatile void *dst, const void *src,
 
 #define PIPE_NAME(n)			('A' + (n))
 
+/* remain compatible to xorg-server 1.6 */
+#ifndef MONITOR_EDID_COMPLETE_RAWDATA
+#define MONITOR_EDID_COMPLETE_RAWDATA EDID_COMPLETE_RAWDATA
+#endif
+
 struct pci_device *
 intel_host_bridge (void);