From 902b5a9f7c65165ffa86fd3279c79aaeda4c97ec Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Wed, 19 Jan 2011 19:17:10 +0100 Subject: [PATCH] --- yaml --- r: 232119 b: refs/heads/master c: 0e155b2ce293382730b8473f6ceeb7ac9b939b7d h: refs/heads/master i: 232117: 9b0305c4f8cf74ca622688552f07e52f43359a28 232115: 81a7b985edb4151d3686d7f139c910deaf74c3f8 232111: 4f996f1a10f0f4ee0bb81a7626a2333a04c38924 v: v3 --- [refs] | 2 +- trunk/arch/m32r/Kconfig | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 69538becdb04..83487b60f407 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7a0abc7e7767455c9972de25b6c74e87271d16be +refs/heads/master: 0e155b2ce293382730b8473f6ceeb7ac9b939b7d diff --git a/trunk/arch/m32r/Kconfig b/trunk/arch/m32r/Kconfig index 5c291d65196b..ef4c1e442be3 100644 --- a/trunk/arch/m32r/Kconfig +++ b/trunk/arch/m32r/Kconfig @@ -7,6 +7,9 @@ config M32R select HAVE_KERNEL_GZIP select HAVE_KERNEL_BZIP2 select HAVE_KERNEL_LZMA + select HAVE_GENERIC_HARDIRQS + select GENERIC_HARDIRQS_NO_DEPRECATED + select GENERIC_IRQ_PROBE config SBUS bool @@ -19,14 +22,6 @@ config ZONE_DMA bool default y -config GENERIC_HARDIRQS - bool - default y - -config GENERIC_IRQ_PROBE - bool - default y - config NO_IOPORT def_bool y