summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorZhenyu Wang <zhenyuw@linux.intel.com>2010-08-27 05:06:48 +0200
committerChris Wilson <chris@chris-wilson.co.uk>2010-09-07 12:16:42 +0200
commit93f5f7f1249e76a5e8afbdab53f90b10c41fdb61 (patch)
tree0565797da0c29ed6717977b70ef08a78d7893466 /drivers/char
parentagp/intel: fix physical address mask bits for sandybridge (diff)
downloadlinux-93f5f7f1249e76a5e8afbdab53f90b10c41fdb61.tar.xz
linux-93f5f7f1249e76a5e8afbdab53f90b10c41fdb61.zip
agp/intel: use #ifdef idiom for intel-agp.h
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com> Cc: stable@kernel.org Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'drivers/char')
-rw-r--r--drivers/char/agp/intel-agp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/char/agp/intel-agp.h b/drivers/char/agp/intel-agp.h
index 08d47532e605..78124a8402e5 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