From patchwork Fri Aug 27 03:19:17 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhenyu Wang X-Patchwork-Id: 136491 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 o7R3QX7T012602 for ; Fri, 27 Aug 2010 03:27:10 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 941E79F57F for ; Thu, 26 Aug 2010 20:26:33 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTP id C17419F3BA for ; Thu, 26 Aug 2010 20:26:23 -0700 (PDT) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga102.jf.intel.com with ESMTP; 26 Aug 2010 20:26:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.56,277,1280732400"; d="scan'208";a="651757176" Received: from snb-beast.sh.intel.com (HELO localhost.localdomain) ([10.239.36.55]) by orsmga001.jf.intel.com with ESMTP; 26 Aug 2010 20:26:22 -0700 From: Zhenyu Wang To: eric@anholt.net Date: Fri, 27 Aug 2010 11:19:17 +0800 Message-Id: <1282879159-4558-1-git-send-email-zhenyuw@linux.intel.com> X-Mailer: git-send-email 1.7.0.4 Cc: intel-gfx@lists.freedesktop.org Subject: [Intel-gfx] [PATCH 1/3] agp/intel: use #ifdef idiom for intel-agp.h X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-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, 27 Aug 2010 03:27:10 +0000 (UTC) diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h index 08d4753..78124a8 100644 --- a/drivers/char/agp/intel-agp.h +++ b/drivers/char/agp/intel-agp.h @@ -1,6 +1,8 @@ /* * Common Intel AGPGART and GTT definitions. */ +#ifndef _INTEL_AGP_H +#define _INTEL_AGP_H /* Intel registers */ #define INTEL_APSIZE 0xb4 @@ -244,3 +246,5 @@ agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_MA_HB || \ agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_IRONLAKE_MC2_HB || \ IS_SNB) + +#endif