summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-02-20 16:55:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-02-20 16:55:41 -0800
commitc52042ba5cd2071d9a69972d71997144d236e962 (patch)
treeec7979b6c9390ff36ccd784c7235706c769d493c /arch
parentcf7ad04300f4ab0078e6bc41e305423ea159e8c4 (diff)
parentb72c7d543589736d43da531566490dd31572f5ca (diff)
downloadop-kernel-dev-c52042ba5cd2071d9a69972d71997144d236e962.zip
op-kernel-dev-c52042ba5cd2071d9a69972d71997144d236e962.tar.gz
Merge branch 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6
* 'omap-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6: omap: Remove DEBUG_FS dependency for mux name checking
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/mux.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c
index 5fedc50..5fef73f 100644
--- a/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@ -961,16 +961,14 @@ static void __init omap_mux_init_list(struct omap_mux *superset)
while (superset->reg_offset != OMAP_MUX_TERMINATOR) {
struct omap_mux *entry;
-#ifndef CONFIG_OMAP_MUX
- /* Skip pins that are not muxed as GPIO by bootloader */
- if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
+#ifdef CONFIG_OMAP_MUX
+ if (!superset->muxnames || !superset->muxnames[0]) {
superset++;
continue;
}
-#endif
-
-#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS)
- if (!superset->muxnames || !superset->muxnames[0]) {
+#else
+ /* Skip pins that are not muxed as GPIO by bootloader */
+ if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
superset++;
continue;
}
OpenPOWER on IntegriCloud