summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorChristoph Egger <siccegge@cs.fau.de>2010-07-05 16:31:53 +0300
committerTony Lindgren <tony@atomide.com>2010-07-05 16:31:53 +0300
commit312b80a1e52853cd2c6db9623e8fd9aec822cd40 (patch)
treee287cca8e651157dd223012dffbc569bbe6a6334 /arch/arm/mach-omap1
parent8d9166b519fd880faccdd65fa637d9ec3e2e41e5 (diff)
downloadtalos-obmc-linux-312b80a1e52853cd2c6db9623e8fd9aec822cd40.tar.gz
talos-obmc-linux-312b80a1e52853cd2c6db9623e8fd9aec822cd40.zip
Replace dead OMAP_MUX_ERRORS with OMAP_MUX_WARNINGS
OMAP_MUX_ERRORS doesn't exist in Kconfig, therefore replacing all references for it with OMAP_MUX_WARNINGS in the source code. Signed-off-by: Christoph Egger <siccegge@cs.fau.de> Acked-by: Kirill A. Shutemov <kirill@shutemov.name> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap1')
-rw-r--r--arch/arm/mach-omap1/mux.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/mux.c b/arch/arm/mach-omap1/mux.c
index 84341377232d..3e98835d8f18 100644
--- a/arch/arm/mach-omap1/mux.c
+++ b/arch/arm/mach-omap1/mux.c
@@ -440,7 +440,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;
OpenPOWER on IntegriCloud