summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-11-26 16:02:54 +0900
committerTom Rini <trini@ti.com>2014-12-08 09:35:46 -0500
commit8b923a56dc0eb9f1ce9d616ae93bd0f63857f315 (patch)
tree5820a8dc89daac6008d964361bbd1cbf26c0f4c0
parent063ec38a752a79ebcecfaf47802c636f2318c7bf (diff)
downloadu-boot-imx-8b923a56dc0eb9f1ce9d616ae93bd0f63857f315.zip
u-boot-imx-8b923a56dc0eb9f1ce9d616ae93bd0f63857f315.tar.gz
u-boot-imx-8b923a56dc0eb9f1ce9d616ae93bd0f63857f315.tar.bz2
blackfin: include <linux/compiler.h> rather than define __iomem
The macro __iomem is defined in include/linux/compiler.h. Let's include it rather than double __iomem defines. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Sonic Zhang <sonic.adi@gmail.com>
-rw-r--r--arch/blackfin/include/asm/io.h3
-rw-r--r--drivers/block/pata_bfin.h1
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h
index 69f08bc..aadb0d2 100644
--- a/arch/blackfin/include/asm/io.h
+++ b/arch/blackfin/include/asm/io.h
@@ -11,10 +11,9 @@
#ifdef __KERNEL__
+#include <linux/compiler.h>
#include <asm/blackfin.h>
-#define __iomem
-
static inline void sync(void)
{
SSYNC();
diff --git a/drivers/block/pata_bfin.h b/drivers/block/pata_bfin.h
index 2093cf0..b678f60 100644
--- a/drivers/block/pata_bfin.h
+++ b/drivers/block/pata_bfin.h
@@ -43,7 +43,6 @@ struct ata_port {
#define DRV_NAME "pata-bfin"
#define DRV_VERSION "0.9"
-#define __iomem
#define ATA_REG_CTRL 0x0E
#define ATA_REG_ALTSTATUS ATA_REG_CTRL