summaryrefslogtreecommitdiff
path: root/arch/avr32
diff options
context:
space:
mode:
authorJosh Wu <josh.wu@atmel.com>2013-04-17 15:58:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-04-17 16:10:44 -0700
commit472d326677db37625903265428582694394d2df7 (patch)
tree968e9d59e497093cfc323e0ca751e0735047bea9 /arch/avr32
parent9cc3a5bd40067b9a0fbd49199d0780463fc2140f (diff)
downloadlinux-3.10-472d326677db37625903265428582694394d2df7.tar.gz
linux-3.10-472d326677db37625903265428582694394d2df7.tar.bz2
linux-3.10-472d326677db37625903265428582694394d2df7.zip
avr32: fix build error in atstk1006_defconfig
fixed the following compile error when use avr32 atstk1006_defconfig: drivers/mtd/nand/atmel_nand.c: In function 'pmecc_err_location': drivers/mtd/nand/atmel_nand.c:639: error: implicit declaration of function 'writel_relaxed' which was introduced by commit 1c7b874d33b4 ("mtd: at91: atmel_nand: add Programmable Multibit ECC controller support"). The PMECC for nand flash code uses writel_relaxed(). But in avr32, there is no macro "writel_relaxed" defined. This patch add writex_relaxed macro definitions. Signed-off-by: Josh Wu <josh.wu@atmel.com> Acked-by: Havard Skinnemoen <havard@skinnemoen.net> Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no> Cc: David Woodhouse <David.Woodhouse@intel.com> Cc: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/avr32')
-rw-r--r--arch/avr32/include/asm/io.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/avr32/include/asm/io.h b/arch/avr32/include/asm/io.h
index cf60d0a9f17..fc6483f83cc 100644
--- a/arch/avr32/include/asm/io.h
+++ b/arch/avr32/include/asm/io.h
@@ -165,6 +165,10 @@ BUILDIO_IOPORT(l, u32)
#define readw_be __raw_readw
#define readl_be __raw_readl
+#define writeb_relaxed writeb
+#define writew_relaxed writew
+#define writel_relaxed writel
+
#define writeb_be __raw_writeb
#define writew_be __raw_writew
#define writel_be __raw_writel