summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 22:44:18 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 22:44:18 +0100
commit43872fa788060eef91ae437957e0a5e39f1c56fd (patch)
treedba464da61167d84b4f7470edebd5a769a78f9ee /drivers/net
parentMerge branch 'pxa/fixes' into next/fixes (diff)
parentARM: 7104/1: plat-pxa: break out GPIO driver specifics (diff)
downloadlinux-43872fa788060eef91ae437957e0a5e39f1c56fd.tar.xz
linux-43872fa788060eef91ae437957e0a5e39f1c56fd.zip
Merge branch 'depends/rmk/gpio' into next/fixes
This sorts out merge conflicts with the arm/gpio branch that already got merged into mainline Linux. Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'drivers/net')
-rw-r--r--drivers/net/arm/at91_ether.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/arm/at91_ether.c b/drivers/net/arm/at91_ether.c
index 29dc43523cec..48b4ec121f7f 100644
--- a/drivers/net/arm/at91_ether.c
+++ b/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"