From: Wang Zhenyu <zhenyu.z.wang@intel.com>

Remove volatile type declare for IO mem variables.

A single private gart data is used by all drivers, this
makes it clean. Eric Anholt wrote the original patch.

Signed-off-by: Wang Zhenyu <zhenyu.z.wang@intel.com>
Cc: Dave Jones <davej@codemonkey.org.uk>
Cc: Keith Packard <keithp@keithp.com>
Cc: Eric Anholt <eric@anholt.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 drivers/char/agp/intel-agp.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff -puN drivers/char/agp/intel-agp.c~intel_agp-cleanup-intel-private-data-update drivers/char/agp/intel-agp.c
--- a/drivers/char/agp/intel-agp.c~intel_agp-cleanup-intel-private-data-update
+++ a/drivers/char/agp/intel-agp.c
@@ -95,8 +95,8 @@ static struct gatt_mask intel_i810_masks
 
 static struct _intel_private {
 	struct pci_dev *pcidev;	/* device one */
-	volatile u8 __iomem *registers;
-	volatile u32 __iomem *gtt;		/* I915G */
+	u8 __iomem *registers;
+	u32 __iomem *gtt;		/* I915G */
 	int num_dcache_entries;
 	/* gtt_entries is the number of gtt entries that are already mapped
 	 * to stolen memory.  Stolen memory is larger than the memory mapped
_