diff --git a/[refs] b/[refs] index 3e3a7ed5dbc5..6b020a361061 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 71e76e90ef24a6f10591937a48bd76d9111f7a1c +refs/heads/master: 79fd468200dfc68d8996e94f4f3d5eac832a652b diff --git a/trunk/arch/sh/Kconfig b/trunk/arch/sh/Kconfig index ff9177c8f643..2d39594bcdd6 100644 --- a/trunk/arch/sh/Kconfig +++ b/trunk/arch/sh/Kconfig @@ -101,10 +101,6 @@ config GENERIC_LOCKBREAK def_bool y depends on SMP && PREEMPT -config SYS_SUPPORTS_PM - bool - depends on !SMP - config ARCH_SUSPEND_POSSIBLE def_bool n