Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c52042ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

arch/arm/mach-omap2/mux.c

+5 −7
Original line number Diff line number Diff line
@@ -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;

		}