Merge tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kernel/git...

From Paul Walmsley (as per Tony Lindgren's request):
 "Some uncontroversial OMAP clock, hwmod, and compiler warning fixes for 3.5-rc"

* tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending:
  ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled
  ARM: OMAP2+: mux: fix sparse warning
  ARM: OMAP2+: CM: increase the module disable timeout
  ARM: OMAP4: clock data: add clockdomains for clocks used as main clocks
  ARM: OMAP4: hwmod data: fix 32k sync timer idle modes
  ARM: OMAP4+: hwmod: fix issue causing IPs not going back to Smart-Standby
  ARM: OMAP: PM: Lock clocks list while generating summary

diff --combined arch/arm/mach-omap2/mux.c
index 4b46b91,d3ef99c..9fe6829
--- 1/arch/arm/mach-omap2/mux.c
--- 2/arch/arm/mach-omap2/mux.c
+++ b/arch/arm/mach-omap2/mux.c
@@@ -41,6 -41,7 +41,7 @@@
  #include "control.h"
  #include "mux.h"
  #include "prm.h"
+ #include "common.h"
  
  #define OMAP_MUX_BASE_OFFSET          0x30    /* Offset from CTRL_BASE */
  #define OMAP_MUX_BASE_SZ              0x5ca
@@@ -217,7 -218,8 +218,7 @@@ static int __init _omap_mux_get_by_name
        return -ENODEV;
  }
  
 -static int __init
 -omap_mux_get_by_name(const char *muxname,
 +int __init omap_mux_get_by_name(const char *muxname,
                        struct omap_mux_partition **found_partition,
                        struct omap_mux **found_mux)
  {