Browse Source

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: Tomasz Figa <t.figa@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Tomasz Figa 11 years ago
parent
commit
2c054716a5
2 changed files with 4 additions and 2 deletions
  1. 3 2
      arch/arm/plat-samsung/Kconfig
  2. 1 0
      arch/arm/plat-samsung/pm-debug.c

+ 3 - 2
arch/arm/plat-samsung/Kconfig

@@ -268,8 +268,9 @@ config S5P_DEV_MFC
 comment "Power management"
 comment "Power management"
 
 
 config SAMSUNG_PM_DEBUG
 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
 	help
 	  Say Y here if you want verbose debugging from the PM Suspend and
 	  Say Y here if you want verbose debugging from the PM Suspend and
 	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>
 	  Resume code. See <file:Documentation/arm/Samsung-S3C24XX/Suspend.txt>

+ 1 - 0
arch/arm/plat-samsung/pm-debug.c

@@ -14,6 +14,7 @@
  */
  */
 
 
 #include <linux/serial_core.h>
 #include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
 #include <linux/io.h>
 #include <linux/io.h>
 
 
 #include <asm/mach/map.h>
 #include <asm/mach/map.h>