On Feb 6, 2008 4:21 AM, Suresh Rajashekara <suresh@xxxxxxxxxxxxxxxxxxxx> wrote: > 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_24XX macro. > > Signed-off-by: Suresh Rajashekara <suresh@xxxxxxxxxxxxxxxxxxxx> Acked-by: David Cohen <david.cohen@xxxxxxxxxxx> > --- > include/asm-arm/arch-omap/mux.h | 12 ++++++++++++ > 1 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/include/asm-arm/arch-omap/mux.h b/include/asm-arm/arch-omap/mux.h > index e5a96c3..a84cd8c 100644 > --- a/include/asm-arm/arch-omap/mux.h > +++ b/include/asm-arm/arch-omap/mux.h > @@ -114,6 +114,7 @@ > PU_PD_REG(NA, 0) \ > }, > > +#if defined(CONFIG_OMAP_MUX_DEBUG) || defined(CONFIG_OMAP_MUX_WARNINGS) > #define MUX_CFG_24XX(desc, reg_offset, mode, \ > pull_en, pull_mode, dbg) \ > { \ > @@ -124,6 +125,17 @@ > .pull_val = pull_en, \ > .pu_pd_val = pull_mode, \ > }, > +#else > +#define MUX_CFG_24XX(desc, reg_offset, mode, \ > + pull_en, pull_mode, dbg) \ > +{ \ > + .name = desc, \ > + .mux_reg = reg_offset, \ > + .mask = mode, \ > + .pull_val = pull_en, \ > + .pu_pd_val = pull_mode, \ > +}, > +#endif > > /* 24xx/34xx mux bit defines */ > #define OMAP2_PULL_ENA (1 << 3) > -- > 1.5.2.5 > - > 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 > - 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