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/m68k/Kconfig | |
| parent | d7eaf400f583154283e26244ee671585cd413156 (diff) | |
| parent | c6294af3fa2f5b352c2de9ff1086cb236796a54c (diff) | |
Merge branch 'akpm/master'
Diffstat (limited to 'arch/m68k/Kconfig')
| -rw-r--r-- | arch/m68k/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig index b2e322939256..87b7c7581b1d 100644 --- a/arch/m68k/Kconfig +++ b/arch/m68k/Kconfig @@ -52,7 +52,7 @@ config TIME_LOW_RES bool default y -config NO_IOPORT +config NO_IOPORT_MAP def_bool y config NO_DMA |