diff options
| author | Masahiro Yamada <yamada.m@jp.panasonic.com> | 2014-11-26 16:02:54 +0900 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2014-12-08 09:35:46 -0500 |
| commit | 8b923a56dc0eb9f1ce9d616ae93bd0f63857f315 (patch) | |
| tree | 5820a8dc89daac6008d964361bbd1cbf26c0f4c0 | |
| parent | 063ec38a752a79ebcecfaf47802c636f2318c7bf (diff) | |
| download | talos-obmc-uboot-8b923a56dc0eb9f1ce9d616ae93bd0f63857f315.tar.gz talos-obmc-uboot-8b923a56dc0eb9f1ce9d616ae93bd0f63857f315.zip | |
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.h | 3 | ||||
| -rw-r--r-- | drivers/block/pata_bfin.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/blackfin/include/asm/io.h b/arch/blackfin/include/asm/io.h index 69f08bc7ef..aadb0d2d4e 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 2093cf06b4..b678f60b2d 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 |
