From 35a5b907293fdd6a9f97d3b9d04118f86846df58 Mon Sep 17 00:00:00 2001
From: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Date: Thu, 18 Dec 2008 16:20:47 +0100
Subject: [PATCH] --- yaml --- r: 119958 b: refs/heads/master c:
 8983fdb50878ae6fa2ced336ef6072f8d5d502e3 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/avr32/boards/favr-32/flash.c | 2 +-
 trunk/arch/avr32/boards/favr-32/setup.c | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 4e93a6213122..534557e08124 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: de13d28e0cb4923600e618641063b3c54961a474
+refs/heads/master: 8983fdb50878ae6fa2ced336ef6072f8d5d502e3
diff --git a/trunk/arch/avr32/boards/favr-32/flash.c b/trunk/arch/avr32/boards/favr-32/flash.c
index 5f139b7cb5f7..604bbd5e41d9 100644
--- a/trunk/arch/avr32/boards/favr-32/flash.c
+++ b/trunk/arch/avr32/boards/favr-32/flash.c
@@ -13,7 +13,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/physmap.h>
 
-#include <asm/arch/smc.h>
+#include <mach/smc.h>
 
 static struct smc_timing flash_timing __initdata = {
 	.ncs_read_setup		= 0,
diff --git a/trunk/arch/avr32/boards/favr-32/setup.c b/trunk/arch/avr32/boards/favr-32/setup.c
index 7538f3d2b9e0..1ee4faf0742d 100644
--- a/trunk/arch/avr32/boards/favr-32/setup.c
+++ b/trunk/arch/avr32/boards/favr-32/setup.c
@@ -25,10 +25,10 @@
 
 #include <asm/setup.h>
 
-#include <asm/arch/at32ap700x.h>
-#include <asm/arch/init.h>
-#include <asm/arch/board.h>
-#include <asm/arch/portmux.h>
+#include <mach/at32ap700x.h>
+#include <mach/init.h>
+#include <mach/board.h>
+#include <mach/portmux.h>
 
 /* Oscillator frequencies. These are board-specific */
 unsigned long at32_board_osc_rates[3] = {