Skip to contentSkip to conversation

Fix build error for mach-s3c64xx

PATCH New Darius Augulis 2 participants 2 messages Jul 27, 2010 – Jul 28, 2010

Subsystems (3)
Arm (32-bit) Arm sub-architectures Arm Samsung Exynos
lore
Share & tools
lore

Darius Augulis

author
#0 lore raw

PATCH 1/1 Fix build error for mach-s3c64xx

If SAMSUNG_DEV_ADC is not set, s3c6410_map_io()
tries to init undefined device s3c_device_adc.

---
 arch/arm/mach-s3c64xx/s3c6410.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/s3c6410.c +3 -0
index 014401c..29338bd 100644
@@ -54,7 +54,10 @@ void __init s3c6410_map_io(void)
 	s3c_i2c0_setname("s3c2440-i2c");
 	s3c_i2c1_setname("s3c2440-i2c");
 
+#ifdef CONFIG_SAMSUNG_DEV_ADC
 	s3c_device_adc.name	= "s3c64xx-adc";
+#endif
+
 	s3c_device_nand.name = "s3c6400-nand";
 	s3c_onenand_setname("s3c6410-onenand");
 	s3c64xx_onenand1_setname("s3c6410-onenand");
#1 lore raw

PATCH 1/1 Fix build error for mach-s3c64xx

Review

Quoted 8 lines · Darius Augulis

If SAMSUNG_DEV_ADC is not set, s3c6410_map_io()
tries to init undefined device s3c_device_adc.

---
 arch/arm/mach-s3c64xx/s3c6410.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
(quoted diff) +0 -0

b/arch/arm/mach-s3c64xx/s3c6410.c

Quoted 6 lines

index 014401c..29338bd 100644

arch/arm/mach-s3c64xx/s3c6410.c void __init s3c6410_map_io(void) · line 63

Quoted 10 lines
arch/arm/mach-s3c64xx/s3c6410.c +3 -0
@@ -54,7 +54,10 @@ void __init s3c6410_map_io(void)
 	s3c_i2c0_setname("s3c2440-i2c");
 	s3c_i2c1_setname("s3c2440-i2c");
 
+#ifdef CONFIG_SAMSUNG_DEV_ADC
 	s3c_device_adc.name	= "s3c64xx-adc";
+#endif
+
 	s3c_device_nand.name = "s3c6400-nand";
 	s3c_onenand_setname("s3c6410-onenand");
 	s3c64xx_onenand1_setname("s3c6410-onenand");

Hi,

Already submitted and applied about this.

Please refer to below URL.
http://lists.infradead.org/pipermail/linux-arm-kernel/2010-June/019225.html

http://lists.infradead.org/pipermail/linux-arm-kernel/2010-July/019436.html

Thanks.

Best regards,
Kgene.
--
Kukjin Kim <[email protected]>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd.