aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGary S. Robertson <gary.robertson@linaro.org>2016-01-11 13:43:03 -0600
committerGary S. Robertson <gary.robertson@linaro.org>2016-01-11 13:43:03 -0600
commitd532db8c82faef41ad16e6db7a8459aa21f4a822 (patch)
treeae32c45d46dac187e8e788ff6c3828f10ca3a336
parent841b28c470a8062aff95e73451d9973401982226 (diff)
Revert "MTD: MAP: _relaxed build fix"
This reverts commit 6eeb06f214ec910f17961a169487d179b0c6d23e. Kernel version v4.1.4 contains an alternative solution to the compile errors addressed by this patch, and this patch subsequently generates warnings about macro redefinitions - removing it to clean up x86 compiles. Signed-off-by: Gary S. Robertson <gary.robertson@linaro.org>
-rw-r--r--arch/x86/include/asm/io.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h
index 14aa13a72e38..34a5b93704d3 100644
--- a/arch/x86/include/asm/io.h
+++ b/arch/x86/include/asm/io.h
@@ -81,10 +81,6 @@ build_mmio_write(__writel, "l", unsigned int, "r", )
#define __raw_writew __writew
#define __raw_writel __writel
-#define writeb_relaxed __writeb
-#define writew_relaxed __writew
-#define writel_relaxed __writel
-
#define mmiowb() barrier()
#ifdef CONFIG_X86_64