[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <53C3A855.5040002@gmail.com>
Date: Mon, 14 Jul 2014 11:52:21 +0200
From: Tomasz Figa <tomasz.figa@...il.com>
To: Kukjin Kim <kgene.kim@...sung.com>
CC: Tomasz Figa <t.figa@...sung.com>,
linux-samsung-soc@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Marek Szyprowski <m.szyprowski@...sung.com>,
Daniel Drake <drake@...lessm.com>
Subject: Re: [PATCH v2 4/6] ARM: SAMSUNG: Restore Samsung PM Debug functionality
Hi Kukjin,
On 25.06.2014 13:43, Tomasz Figa wrote:
> 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@...sung.com>
> ---
> arch/arm/plat-samsung/Kconfig | 5 +++--
> arch/arm/plat-samsung/pm-debug.c | 1 +
> 2 files changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
> index 301b892..ad9515f 100644
> --- a/arch/arm/plat-samsung/Kconfig
> +++ b/arch/arm/plat-samsung/Kconfig
> @@ -413,8 +413,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>
> diff --git a/arch/arm/plat-samsung/pm-debug.c b/arch/arm/plat-samsung/pm-debug.c
> index 8f19f66..3960960 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>
>
Please consider this patch for next fixes pull request.
Best regards,
Tomasz
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists