From patchwork Wed Mar 30 14:42:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 8697341 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 31D619F39A for ; Wed, 30 Mar 2016 14:42:32 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 754AF20389 for ; Wed, 30 Mar 2016 14:42:31 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 9912420383 for ; Wed, 30 Mar 2016 14:42:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 43B3B6E20E; Wed, 30 Mar 2016 14:42:28 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x231.google.com (mail-wm0-x231.google.com [IPv6:2a00:1450:400c:c09::231]) by gabe.freedesktop.org (Postfix) with ESMTPS id E45116E20E for ; Wed, 30 Mar 2016 14:42:25 +0000 (UTC) Received: by mail-wm0-x231.google.com with SMTP id p65so186456593wmp.1 for ; Wed, 30 Mar 2016 07:42:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=tkbYE8g1zvPmXSTxxAeH/7qnDfC9yFU2/7VMK+7kGp8=; b=K7x1kg0Ktju0Hg/7HaHQxiyPKDcRY0BE6+6CzmpgR93ywAJF8hDoM8p3Vl8EVQAjbt hFvgwu2+uTYY4BB9X5wMNo4ZncQdzbDlKnKUZ8b/iDYHXbKRqpqoPbAgXqw7qDCEmFrH dXMigyCFaSm6EXArxFVO1Wkx1MAPFWkR4j+4g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=tkbYE8g1zvPmXSTxxAeH/7qnDfC9yFU2/7VMK+7kGp8=; b=KSDKvWvw4l4T43W9Yji1B3R2zVl2dKqU+pyehcOE6U3nO0jq3g38QPVeOm2+XgfaiM nImPbIBA+f7RDWbH4FS1Tm9kqkksXJdmMGPjC1ciSEHEH3WmnznZ133FfCI9+fO824M0 HtI8JXgVHzWkcCIzwsMbwrTrSmORZ78b274pno4pq4mL3RIQtm62T2sQH6aAOuuK6Axd DyTjW+VktpIQSEBzO0NoqjYEOqwozgnZRtGDE+xY3NzpH4aqMujY7Jrmk+30mbuDcdAU Rv6qI6RgSSY0aC3lkF8U8qiCxHmg6LtqOql4LXcCmHFTn2vM02A4ioKGCXR4nOflCRdp W0+g== X-Gm-Message-State: AD7BkJK+kjtVI8qvzAkARGNtwQ5ikP5QezLnTpJNUP75Ss4HZqwPnstBnM4rPPeOj3FrKA== X-Received: by 10.28.6.139 with SMTP id 133mr24436784wmg.84.1459348943657; Wed, 30 Mar 2016 07:42:23 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id 192sm4812947wmw.0.2016.03.30.07.42.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 30 Mar 2016 07:42:22 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/2] drm: Untangle __KERNEL__ guards Date: Wed, 30 Mar 2016 16:42:22 +0200 Message-Id: <1459348943-12803-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.0.rc3 In-Reply-To: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> References: <1459347584-30566-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Emil Velikov , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP make headers_install can't handle fancy conditions, so let's simplify things for it a bit. Cc: Emil Velikov Signed-off-by: Daniel Vetter Reviewed-by: Emil Velikov --- include/uapi/drm/drm.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/include/uapi/drm/drm.h b/include/uapi/drm/drm.h index c7ecc3abff03..3b56285a7e2a 100644 --- a/include/uapi/drm/drm.h +++ b/include/uapi/drm/drm.h @@ -36,7 +36,13 @@ #ifndef _DRM_H_ #define _DRM_H_ -#if defined(__KERNEL__) || defined(__linux__) +#if defined(__KERNEL__) + +#include +#include +typedef unsigned int drm_handle_t; + +#elif defined(__linux__) #include #include