diff --git a/[refs] b/[refs] index db7fb96590b7..5a8259d0b76c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 121a09e590d54be840289c6feac840453aa999d9 +refs/heads/master: 0938e7586440ac97cedc0f5528a8684ebfa4ce43 diff --git a/trunk/arch/blackfin/Kconfig b/trunk/arch/blackfin/Kconfig index 2a3a7ea5958c..25232ba08119 100644 --- a/trunk/arch/blackfin/Kconfig +++ b/trunk/arch/blackfin/Kconfig @@ -65,6 +65,10 @@ config GENERIC_CALIBRATE_DELAY bool default y +config HARDWARE_PM + def_bool y + depends on OPROFILE + source "init/Kconfig" source "kernel/Kconfig.preempt"