diff --git a/[refs] b/[refs] index 6d218c9d56f2..f77044797c92 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e514b2a811c25434ac5fec13c09c1b82cafb0c9 +refs/heads/master: 985a94a96d294fe6d2c72d013de09b81b637ed58 diff --git a/trunk/arch/um/Kconfig.common b/trunk/arch/um/Kconfig.common index 20a49ba93cb9..43ef890d292c 100644 --- a/trunk/arch/um/Kconfig.common +++ b/trunk/arch/um/Kconfig.common @@ -56,11 +56,6 @@ config GENERIC_CLOCKEVENTS bool default y -# Used in kernel/irq/manage.c and include/linux/irq.h -config IRQ_RELEASE_METHOD - bool - default y - config HZ int default 100 diff --git a/trunk/arch/um/defconfig b/trunk/arch/um/defconfig index fdc97e2c3d73..7823ab12e6a4 100644 --- a/trunk/arch/um/defconfig +++ b/trunk/arch/um/defconfig @@ -12,7 +12,6 @@ CONFIG_LOCKDEP_SUPPORT=y CONFIG_GENERIC_CALIBRATE_DELAY=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_IRQ_RELEASE_METHOD=y CONFIG_HZ=100 #