Merge branch 'devel-misc' into omap-for-linus

[net-next-2.6.git] / arch / arm / mach-omap1 / mux.c

diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 6a9b42f4113ffc193438d6ecf274eb4d1c962df6..7835add0034478309f5790f2cd0cde6e0cfa7bc8 100644 (file)
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -444,7 +444,7 @@ int __init_or_module omap1_cfg_reg(const struct pin_config *cfg)
        }
 #endif
 
-#ifdef CONFIG_OMAP_MUX_ERRORS
+#ifdef CONFIG_OMAP_MUX_WARNINGS
        return warn ? -ETXTBSY : 0;
 #else
        return 0;