[PATCH 1/3] ARCH: OMAP: Fixing MUX_CFG_34XX macro.

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



If CONFIG_OMAP_MUX_DEBUG and CONFIG_OMAP_MUX_WARNING are not set, the debug
member is not declared on pin_config struct and should not be used on
MUX_CFG_34XX macro.

Signed-off-by: David Cohen <david.cohen@xxxxxxxxxxx>
---
 include/asm-arm/arch-omap/mux.h |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index e5a96c3..fbdc6e5 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -166,12 +166,20 @@
 #define OMAP34XX_PIN_OFF_INPUT_PULLDOWN	(OMAP3_OFF_EN | OMAP3_OFF_PULL_EN)
 #define OMAP34XX_PIN_OFF_WAKEUPENABLE	OMAP3_WAKEUP_EN
 
+#if	defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
 #define MUX_CFG_34XX(desc, reg_offset, mux_value){		\
 	.name		= desc,					\
 	.debug		= 0,					\
 	.mux_reg	= reg_offset,				\
 	.mux_val	= mux_value				\
 },
+#else
+#define MUX_CFG_34XX(desc, reg_offset, mux_value){		\
+	.name		= desc,					\
+	.mux_reg	= reg_offset,				\
+	.mux_val	= mux_value				\
+},
+#endif
 
 struct pin_config {
 	char 			*name;
-- 
1.5.4

-
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Arm (vger)]     [ARM Kernel]     [ARM MSM]     [Linux Tegra]     [Linux WPAN Networking]     [Linux Wireless Networking]     [Maemo Users]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Trails]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux