2 files changed, 7 insertions, 3 deletions

diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index 58645a58d0d8..b57e922f1614 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -427,8 +427,7 @@ comment "Power management"
 
 config SAMSUNG_PM_DEBUG
         bool "S3C2410 PM Suspend debug"
-        depends on PM
-        select DEBUG_LL
+        depends on PM && DEBUG_KERNEL && DEBUG_S3C_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>
@@ -445,7 +444,8 @@ config S3C_PM_DEBUG_LED_SMDK
 
 config SAMSUNG_PM_CHECK
         bool "S3C2410 PM Suspend Memory CRC"
-        depends on PM && CRC32
+        depends on PM
+        select CRC32
         help
           Enable the PM code's memory area checksum over sleep. This option
           will generate CRCs of all blocks of memory, and store them before
diff --git a/arch/arm/plat-samsung/init.c b/arch/arm/plat-samsung/init.c
index 8706c6c4f894..a1f925f3121f 100644
--- a/arch/arm/plat-samsung/init.c
+++ b/arch/arm/plat-samsung/init.c
@@ -94,7 +94,9 @@ void __init s3c24xx_init_clocks(int xtal)
 #if IS_ENABLED(CONFIG_SAMSUNG_ATAGS)
 static int nr_uarts __initdata = 0;
 
+#ifdef CONFIG_SERIAL_SAMSUNG_UARTS
 static struct s3c2410_uartcfg uart_cfgs[CONFIG_SERIAL_SAMSUNG_UARTS];
+#endif
 
 /* s3c24xx_init_uartdevs
  *
@@ -109,6 +111,7 @@ void __init s3c24xx_init_uartdevs(char *name,
                                   struct s3c24xx_uart_resources *res,
                                   struct s3c2410_uartcfg *cfg, int no)
 {
+#ifdef CONFIG_SERIAL_SAMSUNG_UARTS
         struct platform_device *platdev;
         struct s3c2410_uartcfg *cfgptr = uart_cfgs;
         struct s3c24xx_uart_resources *resp;
@@ -131,6 +134,7 @@ void __init s3c24xx_init_uartdevs(char *name,
         }
 
         nr_uarts = no;
+#endif
 }
 
 void __init s3c24xx_init_uarts(struct s3c2410_uartcfg *cfg, int no)