diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:31 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-04-03 15:27:33 +1100 |
| commit | 518619f74df435d43ea476d5bdecbd1a5d113149 (patch) | |
| tree | 992ccb3a0626fdd1ff3ae6ec1068d0b7da8335e0 /arch/sh/kernel/io_trapped.c | |
| parent | d7eaf400f583154283e26244ee671585cd413156 (diff) | |
| parent | c6294af3fa2f5b352c2de9ff1086cb236796a54c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/sh/kernel/io_trapped.c')
| -rw-r--r-- | arch/sh/kernel/io_trapped.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/kernel/io_trapped.c b/arch/sh/kernel/io_trapped.c index c0a9761f2f8a..f8ce36286cea 100644 --- a/arch/sh/kernel/io_trapped.c +++ b/arch/sh/kernel/io_trapped.c @@ -22,7 +22,7 @@ #define TRAPPED_PAGES_MAX 16 -#ifdef CONFIG_HAS_IOPORT +#ifdef CONFIG_HAS_IOPORT_MAP LIST_HEAD(trapped_io); EXPORT_SYMBOL_GPL(trapped_io); #endif @@ -90,7 +90,7 @@ int register_trapped_io(struct trapped_io *tiop) tiop->magic = IO_TRAPPED_MAGIC; INIT_LIST_HEAD(&tiop->list); spin_lock_irq(&trapped_lock); -#ifdef CONFIG_HAS_IOPORT +#ifdef CONFIG_HAS_IOPORT_MAP if (flags & IORESOURCE_IO) list_add(&tiop->list, &trapped_io); #endif |