diff options
-rw-r--r-- | arch/m68k/Kconfig | 2 | ||||
-rw-r--r-- | arch/m68k/include/asm/io_no.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index 821170e5f6ed..c3cda41af801 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig | |||
@@ -11,6 +11,7 @@ config M68K | |||
11 | select VIRT_TO_BUS | 11 | select VIRT_TO_BUS |
12 | select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS | 12 | select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS |
13 | select GENERIC_CPU_DEVICES | 13 | select GENERIC_CPU_DEVICES |
14 | select GENERIC_IOMAP | ||
14 | select GENERIC_STRNCPY_FROM_USER if MMU | 15 | select GENERIC_STRNCPY_FROM_USER if MMU |
15 | select GENERIC_STRNLEN_USER if MMU | 16 | select GENERIC_STRNLEN_USER if MMU |
16 | select FPU if MMU | 17 | select FPU if MMU |
@@ -72,7 +73,6 @@ source "kernel/Kconfig.freezer" | |||
72 | config MMU | 73 | config MMU |
73 | bool "MMU-based Paged Memory Management Support" | 74 | bool "MMU-based Paged Memory Management Support" |
74 | default y | 75 | default y |
75 | select GENERIC_IOMAP | ||
76 | help | 76 | help |
77 | Select if you want MMU-based virtualised addressing space | 77 | Select if you want MMU-based virtualised addressing space |
78 | support by paged memory management. If unsure, say 'Y'. | 78 | support by paged memory management. If unsure, say 'Y'. |
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h index 353bf754a972..e1534783e94e 100644 --- a/arch/m68k/include/asm/io_no.h +++ b/arch/m68k/include/asm/io_no.h | |||
@@ -4,6 +4,7 @@ | |||
4 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | 5 | ||
6 | #include <asm/virtconvert.h> | 6 | #include <asm/virtconvert.h> |
7 | #include <asm-generic/iomap.h> | ||
7 | 8 | ||
8 | /* | 9 | /* |
9 | * These are for ISA/PCI shared memory _only_ and should never be used | 10 | * These are for ISA/PCI shared memory _only_ and should never be used |