aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/include
diff options
context:
space:
mode:
Diffstat (limited to 'arch/sh/include')
-rw-r--r--arch/sh/include/asm/io.h4
-rw-r--r--arch/sh/include/asm/io_trapped.h2
-rw-r--r--arch/sh/include/asm/machvec.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/sh/include/asm/io.h b/arch/sh/include/asm/io.h
index 629db2ad7916..728c4c571f40 100644
--- a/arch/sh/include/asm/io.h
+++ b/arch/sh/include/asm/io.h
@@ -122,7 +122,7 @@ __BUILD_MEMORY_STRING(__raw_, l, u32)
122 122
123__BUILD_MEMORY_STRING(__raw_, q, u64) 123__BUILD_MEMORY_STRING(__raw_, q, u64)
124 124
125#ifdef CONFIG_HAS_IOPORT 125#ifdef CONFIG_HAS_IOPORT_MAP
126 126
127/* 127/*
128 * Slowdown I/O port space accesses for antique hardware. 128 * Slowdown I/O port space accesses for antique hardware.
@@ -218,7 +218,7 @@ __BUILD_IOPORT_STRING(w, u16)
218__BUILD_IOPORT_STRING(l, u32) 218__BUILD_IOPORT_STRING(l, u32)
219__BUILD_IOPORT_STRING(q, u64) 219__BUILD_IOPORT_STRING(q, u64)
220 220
221#else /* !CONFIG_HAS_IOPORT */ 221#else /* !CONFIG_HAS_IOPORT_MAP */
222 222
223#include <asm/io_noioport.h> 223#include <asm/io_noioport.h>
224 224
diff --git a/arch/sh/include/asm/io_trapped.h b/arch/sh/include/asm/io_trapped.h
index f1251d4f0ba9..4ab94ef51071 100644
--- a/arch/sh/include/asm/io_trapped.h
+++ b/arch/sh/include/asm/io_trapped.h
@@ -36,7 +36,7 @@ __ioremap_trapped(unsigned long offset, unsigned long size)
36#define __ioremap_trapped(offset, size) NULL 36#define __ioremap_trapped(offset, size) NULL
37#endif 37#endif
38 38
39#ifdef CONFIG_HAS_IOPORT 39#ifdef CONFIG_HAS_IOPORT_MAP
40extern struct list_head trapped_io; 40extern struct list_head trapped_io;
41 41
42static inline void __iomem * 42static inline void __iomem *
diff --git a/arch/sh/include/asm/machvec.h b/arch/sh/include/asm/machvec.h
index eb9c20d971dd..d3324e4f372e 100644
--- a/arch/sh/include/asm/machvec.h
+++ b/arch/sh/include/asm/machvec.h
@@ -21,7 +21,7 @@ struct sh_machine_vector {
21 int (*mv_irq_demux)(int irq); 21 int (*mv_irq_demux)(int irq);
22 void (*mv_init_irq)(void); 22 void (*mv_init_irq)(void);
23 23
24#ifdef CONFIG_HAS_IOPORT 24#ifdef CONFIG_HAS_IOPORT_MAP
25 void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size); 25 void __iomem *(*mv_ioport_map)(unsigned long port, unsigned int size);
26 void (*mv_ioport_unmap)(void __iomem *); 26 void (*mv_ioport_unmap)(void __iomem *);
27#endif 27#endif