commit 0938e7586440ac97cedc0f5528a8684ebfa4ce43
author Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jan 15 13:49:09 2008 -0800
committer Linus Torvalds <torvalds@woody.linux-foundation.org> Tue Jan 15 13:49:09 2008 -0800
tree 3bdb55cb86b1ffb0bd136713eec975efae4cc651
parent 7d2284b09fd967b5cad6f03c6d4a5c064f37b855
parent 121a09e590d54be840289c6feac840453aa999d9

Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  libata: correct handling of TSS DVD
  [libata] core checkpatch fix
  [libata] pata_bf54x: checkpatch fixes
  libata fixes for sparse-found problems

arch/blackfin/Kconfig

diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 2a3a7ea..25232ba 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -65,6 +65,10 @@
 	bool
 	default y
 
+config HARDWARE_PM
+	def_bool y
+	depends on OPROFILE
+
 source "init/Kconfig"
 source "kernel/Kconfig.preempt"