diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 09:23:27 (GMT) |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-26 09:23:27 (GMT) |
commit | 6b620478e58677bb3f4ec884abb29ef9d68c7821 (patch) | |
tree | 7a438fc5412587f9bd9b907d4d423ea52a498006 /arch/cris/Kconfig | |
parent | 906b17dc089f7fa87e37a9cfe6ee185efc90e0da (diff) | |
parent | 6fb1b304255efc5c4c93874ac8c066272e257e28 (diff) | |
download | linux-fsl-qoriq-6b620478e58677bb3f4ec884abb29ef9d68c7821.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into common/serial-rework
Diffstat (limited to 'arch/cris/Kconfig')
-rw-r--r-- | arch/cris/Kconfig | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig index 613e628..0a7a4c1 100644 --- a/arch/cris/Kconfig +++ b/arch/cris/Kconfig @@ -54,6 +54,8 @@ config CRIS bool default y select HAVE_IDE + select HAVE_GENERIC_HARDIRQS + select GENERIC_HARDIRQS_NO_DEPRECATED config HZ int @@ -67,10 +69,6 @@ menu "General setup" source "fs/Kconfig.binfmt" -config GENERIC_HARDIRQS - bool - default y - config ETRAX_CMDLINE string "Kernel command line" default "root=/dev/mtdblock3" |