summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-08-07 10:55:16 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-08-07 10:55:16 +0200
commita1b81a84fff05dbfef45b7012c26e1fee9973e5d (patch)
tree3d053e76542ad4d20bd83ad35c13eabff97003ab /drivers
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes (diff)
parentavr32: Use <mach/foo.h> instead of <asm/arch/foo.h> (diff)
downloadlinux-a1b81a84fff05dbfef45b7012c26e1fee9973e5d.tar.xz
linux-a1b81a84fff05dbfef45b7012c26e1fee9973e5d.zip
Merge branch 'header-move' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/avr32-2.6
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ata/pata_at32.c4
-rw-r--r--drivers/mmc/host/atmel-mci.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ata/pata_at32.c b/drivers/ata/pata_at32.c
index 82fb6e273169..ab61095093b9 100644
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
@@ -24,8 +24,8 @@
#include <linux/err.h>
#include <linux/io.h>
-#include <asm/arch/board.h>
-#include <asm/arch/smc.h>
+#include <mach/board.h>
+#include <mach/smc.h>
#define DRV_NAME "pata_at32"
#define DRV_VERSION "0.0.3"
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c
index 992b4beb757c..0bd06f5bd62f 100644
--- a/drivers/mmc/host/atmel-mci.c
+++ b/drivers/mmc/host/atmel-mci.c
@@ -28,7 +28,7 @@
#include <asm/io.h>
#include <asm/unaligned.h>
-#include <asm/arch/board.h>
+#include <mach/board.h>
#include "atmel-mci-regs.h"