Skip to content

Commit

Permalink
ARM: SAMSUNG: Restore Samsung PM Debug functionality
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Tomasz Figa authored and Kukjin Kim committed Sep 23, 2014
1 parent b756dc4 commit 2c05471
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/arm/plat-samsung/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 1 addition & 0 deletions arch/arm/plat-samsung/pm-debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
*/

#include <linux/serial_core.h>
#include <linux/serial_s3c.h>
#include <linux/io.h>

#include <asm/mach/map.h>
Expand Down

0 comments on commit 2c05471

Please sign in to comment.