git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b756dc4)
ARM: SAMSUNG: Restore Samsung PM Debug functionality
authorTomasz Figa <t.figa@samsung.com>
Tue, 23 Sep 2014 17:10:04 +0000 (02:10 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Tue, 23 Sep 2014 17:47:43 +0000 (02:47 +0900)
Due to recently merged patches and previous merge conflicts, the Samsung
PM Debug functionality no longer can be enabled. This patch fixes
incorrect dependency of SAMSUNG_PM_DEBUG on an integer symbol and adds
missing header inclusion.

Signed-off-by: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
arch/arm/plat-samsung/Kconfig patch | blob | history
arch/arm/plat-samsung/pm-debug.c patch | blob | history

diff --cc arch/arm/plat-samsung/Kconfig
Simple merge
diff --cc arch/arm/plat-samsung/pm-debug.c
Simple merge
Pandora Kernel Repository