diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 05:11:43 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2012-01-12 05:11:43 +0100 |
| commit | b1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch) | |
| tree | 17d15f3a6dc5bdd6205070dbef0e339421b13d25 /arch/cris/Kconfig | |
| parent | Merge branch 'sh/hwblk' into sh-latest (diff) | |
| parent | sh: sh2a: Improve cache flush/invalidate functions (diff) | |
| download | linux-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.xz linux-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.zip | |
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'arch/cris/Kconfig')
| -rw-r--r-- | arch/cris/Kconfig | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 408b055c585f..b3abfb08aa5c 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -19,10 +19,6 @@ config GENERIC_CMOS_UPDATE config ARCH_USES_GETTIMEOFFSET def_bool n -config GENERIC_IOMAP - bool - default y - config ARCH_HAS_ILOG2_U32 bool default n @@ -52,6 +48,7 @@ config CRIS select HAVE_IDE select HAVE_GENERIC_HARDIRQS select GENERIC_IRQ_SHOW + select GENERIC_IOMAP config HZ int |