From df4279213f740d46dd70fb687d6d8e0af697cb11 Mon Sep 17 00:00:00 2001
From: Zhenyu Wang <zhenyuw@linux.intel.com>
Date: Fri, 27 Aug 2010 11:06:48 +0800
Subject: [PATCH] --- yaml --- r: 210196 b: refs/heads/master c:
 93f5f7f1249e76a5e8afbdab53f90b10c41fdb61 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/char/agp/intel-agp.h | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 4236df52c0f4..026a71896545 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dfc2b14ebf538f28a05565f34913ecffedf5024
+refs/heads/master: 93f5f7f1249e76a5e8afbdab53f90b10c41fdb61
diff --git a/trunk/drivers/char/agp/intel-agp.h b/trunk/drivers/char/agp/intel-agp.h
index 08d47532e605..78124a8402e5 100644
--- a/trunk/drivers/char/agp/intel-agp.h
+++ b/trunk/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