From: Tony Lindgren <tony@atomide.com>
Date: Wed, 6 Feb 2008 17:57:35 +0000 (-0800)
Subject: ARM: OMAP: Fix mux compile without debug selected
X-Git-Tag: v2.6.25-omap1~201
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=89a1fcb575ac8713a83204504c7e613a097680d7;p=linux-2.6-omap-h63xx.git

ARM: OMAP: Fix mux compile without debug selected

Fix mux compile without debug selected.

We can also optimize out debug field, but the mux stuff
should be all __init with the board-*.c files, so deal
with that later.

Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h
index e5a96c3b57e..f216b4d8448 100644
--- a/include/asm-arm/arch-omap/mux.h
+++ b/include/asm-arm/arch-omap/mux.h
@@ -176,6 +176,7 @@
 struct pin_config {
 	char 			*name;
 	const unsigned int 	mux_reg;
+	unsigned char		debug;
 
 #if	defined(CONFIG_ARCH_OMAP34XX)
 	u16			mux_val; /* Wake-up, off mode, pull, mux mode */
@@ -196,7 +197,6 @@ struct pin_config {
 #endif
 
 #if	defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS)
-	unsigned char debug;
 	const char *mux_reg_name;
 #endif