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 ---
arch/blackfin/include/asm/io.h | 3 +-- drivers/block/pata_bfin.h | 1 - 2 files changed, 1 insertion(+), 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