From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Herrmann Subject: [PATCH 10/20] drm: move __OS_HAS_AGP into drm_agpsupport.h Date: Fri, 29 Aug 2014 12:12:36 +0200 Message-ID: <1409307166-12396-11-git-send-email-dh.herrmann@gmail.com> References: <1409307166-12396-1-git-send-email-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-we0-f170.google.com (mail-we0-f170.google.com [74.125.82.170]) by gabe.freedesktop.org (Postfix) with ESMTP id D01406E69C for ; Fri, 29 Aug 2014 03:13:36 -0700 (PDT) Received: by mail-we0-f170.google.com with SMTP id p10so1964301wes.1 for ; Fri, 29 Aug 2014 03:13:36 -0700 (PDT) In-Reply-To: <1409307166-12396-1-git-send-email-dh.herrmann@gmail.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dri-devel@lists.freedesktop.org Cc: Daniel Vetter List-Id: dri-devel@lists.freedesktop.org With drm_memory.h gone, there is no header left that uses __OS_HAS_AGP. Move it into drm_agpsupport.h (which is itself included from drmP.h) to hide it harder from public eyes. Signed-off-by: David Herrmann --- include/drm/drmP.h | 2 -- include/drm/drm_agpsupport.h | 3 +++ 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 294f7da..c6f337c 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -67,8 +67,6 @@ #include -#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && defined(MODULE))) - struct module; struct drm_file; diff --git a/include/drm/drm_agpsupport.h b/include/drm/drm_agpsupport.h index 3bebeb4..4f1724c 100644 --- a/include/drm/drm_agpsupport.h +++ b/include/drm/drm_agpsupport.h @@ -8,6 +8,9 @@ #include #include +#define __OS_HAS_AGP (defined(CONFIG_AGP) || (defined(CONFIG_AGP_MODULE) && \ + defined(MODULE))) + struct drm_agp_head { struct agp_kern_info agp_info; struct list_head memory; -- 2.1.0