summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-samsung/pm-debug.c
diff options
context:
space:
mode:
authorTomasz Figa <t.figa@samsung.com>2014-09-23 19:10:04 +0200
committerKukjin Kim <kgene.kim@samsung.com>2014-09-23 19:47:43 +0200
commit2c054716a57c6eac839e94129b17f73930e817eb (patch)
tree03bbd92e1cecc683be2cb7f8139632582f2096cd /arch/arm/plat-samsung/pm-debug.c
parentARM: dts: Fix pull setting in sd4_width8 pin group for exynos4x12 (diff)
downloadlinux-2c054716a57c6eac839e94129b17f73930e817eb.tar.xz
linux-2c054716a57c6eac839e94129b17f73930e817eb.zip
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>
Diffstat (limited to 'arch/arm/plat-samsung/pm-debug.c')
-rw-r--r--arch/arm/plat-samsung/pm-debug.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c
index 8f19f66388dd..39609601f407 100644
--- a/arch/arm/plat-samsung/pm-debug.c
+++ b/arch/arm/plat-samsung/pm-debug.c
@@ -14,6 +14,7 @@
*/
#include <linux/serial_core.h>
+#include <linux/serial_s3c.h>
#include <linux/io.h>
#include <asm/mach/map.h>