Commit c52042ba authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'omap-fixes-for-linus' of...

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
parents cf7ad043 b72c7d54
...@@ -961,16 +961,14 @@ static void __init omap_mux_init_list(struct omap_mux *superset) ...@@ -961,16 +961,14 @@ static void __init omap_mux_init_list(struct omap_mux *superset)
while (superset->reg_offset != OMAP_MUX_TERMINATOR) { while (superset->reg_offset != OMAP_MUX_TERMINATOR) {
struct omap_mux *entry; struct omap_mux *entry;
#ifndef CONFIG_OMAP_MUX #ifdef CONFIG_OMAP_MUX
/* Skip pins that are not muxed as GPIO by bootloader */ if (!superset->muxnames || !superset->muxnames[0]) {
if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
superset++; superset++;
continue; continue;
} }
#endif #else
/* Skip pins that are not muxed as GPIO by bootloader */
#if defined(CONFIG_OMAP_MUX) && defined(CONFIG_DEBUG_FS) if (!OMAP_MODE_GPIO(omap_mux_read(superset->reg_offset))) {
if (!superset->muxnames || !superset->muxnames[0]) {
superset++; superset++;
continue; continue;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment