From 93f5f7f9fa56919e1496732ff28b55d688f2f03f Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Tue, 26 Jul 2011 10:56:19 +0100
Subject: [PATCH] --- yaml --- r: 269388 b: refs/heads/master c:
 60e8972dc7e1df843d7132fb572e74f10502a4b7 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/drivers/ata/pata_at91.c           | 2 +-
 trunk/drivers/ide/at91_ide.c            | 2 +-
 trunk/drivers/net/arm/at91_ether.c      | 2 +-
 trunk/drivers/spi/spi-atmel.c           | 2 +-
 trunk/drivers/tty/serial/atmel_serial.c | 2 +-
 trunk/drivers/video/atmel_lcdfb.c       | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index a6b78dc40ecd..620fb05e33f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1bc857f700fb14bbcb990a81b1255f39807ae59e
+refs/heads/master: 60e8972dc7e1df843d7132fb572e74f10502a4b7
diff --git a/trunk/drivers/ata/pata_at91.c b/trunk/drivers/ata/pata_at91.c
index 960c72571395..3f4c2613b3df 100644
--- a/trunk/drivers/ata/pata_at91.c
+++ b/trunk/drivers/ata/pata_at91.c
@@ -30,7 +30,7 @@
 
 #include <mach/at91sam9_smc.h>
 #include <mach/board.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 #define DRV_NAME		"pata_at91"
 #define DRV_VERSION		"0.3"
diff --git a/trunk/drivers/ide/at91_ide.c b/trunk/drivers/ide/at91_ide.c
index 000a78e5246c..6dede8f366c5 100644
--- a/trunk/drivers/ide/at91_ide.c
+++ b/trunk/drivers/ide/at91_ide.c
@@ -28,7 +28,7 @@
 #include <linux/platform_device.h>
 
 #include <mach/board.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/at91sam9_smc.h>
 
 #define DRV_NAME "at91_ide"
diff --git a/trunk/drivers/net/arm/at91_ether.c b/trunk/drivers/net/arm/at91_ether.c
index 29dc43523cec..48b4ec121f7f 100644
--- a/trunk/drivers/net/arm/at91_ether.c
+++ b/trunk/drivers/net/arm/at91_ether.c
@@ -35,7 +35,7 @@
 #include <asm/mach-types.h>
 
 #include <mach/at91rm9200_emac.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/board.h>
 
 #include "at91_ether.h"
diff --git a/trunk/drivers/spi/spi-atmel.c b/trunk/drivers/spi/spi-atmel.c
index 82dee9a6c0de..d3bff424286f 100644
--- a/trunk/drivers/spi/spi-atmel.c
+++ b/trunk/drivers/spi/spi-atmel.c
@@ -22,7 +22,7 @@
 
 #include <asm/io.h>
 #include <mach/board.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #include <mach/cpu.h>
 
 /* SPI register offsets */
diff --git a/trunk/drivers/tty/serial/atmel_serial.c b/trunk/drivers/tty/serial/atmel_serial.c
index af9b7814965a..b8a00aea090a 100644
--- a/trunk/drivers/tty/serial/atmel_serial.c
+++ b/trunk/drivers/tty/serial/atmel_serial.c
@@ -46,7 +46,7 @@
 
 #ifdef CONFIG_ARM
 #include <mach/cpu.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 #endif
 
 #define PDC_BUFFER_SIZE		512
diff --git a/trunk/drivers/video/atmel_lcdfb.c b/trunk/drivers/video/atmel_lcdfb.c
index 817ab60f7537..dda920623c6a 100644
--- a/trunk/drivers/video/atmel_lcdfb.c
+++ b/trunk/drivers/video/atmel_lcdfb.c
@@ -21,7 +21,7 @@
 
 #include <mach/board.h>
 #include <mach/cpu.h>
-#include <mach/gpio.h>
+#include <asm/gpio.h>
 
 #include <video/atmel_lcdc.h>