Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c054716 authored by Tomasz Figa's avatar Tomasz Figa Committed by Kukjin Kim
Browse files

ARM: SAMSUNG: Restore Samsung PM Debug functionality 



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: default avatarTomasz Figa <t.figa@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent b756dc48

arch/arm/plat-samsung/Kconfig

+3 −2
Original line number Diff line number Diff line
@@ -268,8 +268,9 @@ config S5P_DEV_MFC 
comment "Power management"



config SAMSUNG_PM_DEBUG

	bool "S3C2410 PM Suspend debug"

	depends on PM && DEBUG_KERNEL && DEBUG_S3C_UART

	bool "Samsung PM Suspend debug"

	depends on PM && DEBUG_KERNEL

	depends on DEBUG_EXYNOS_UART || DEBUG_S3C24XX_UART || DEBUG_S3C2410_UART

	help

	  Say Y here if you want verbose debugging from the PM Suspend and

	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>

arch/arm/plat-samsung/pm-debug.c

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 
 */



#include <linux/serial_core.h>

#include <linux/serial_s3c.h>

#include <linux/io.h>



#include <asm/mach/map.h>