diff options
| author | Olof Johansson <olof@lixom.net> | 2012-06-24 01:16:29 +0200 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-06-24 01:16:29 +0200 |
| commit | a34a3b7264fdb40c8d4be8bebb38fd56dc48d162 (patch) | |
| tree | d8625985d600c8fb5ef8b5312e0f13a84af3435b /arch/arm/mach-omap2/mux.c | |
| parent | Merge tag 'omap-fixes-for-v3.5-rc3' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | ARM: OMAP4: hwmod data: Force HDMI in no-idle while enabled (diff) | |
| download | linux-a34a3b7264fdb40c8d4be8bebb38fd56dc48d162.tar.xz linux-a34a3b7264fdb40c8d4be8bebb38fd56dc48d162.zip | |
Merge tag 'omap-fixes-a-for-3.5rc' of git://git.kernel.org/pub/scm/linux/kernel/git/pjw/omap-pending into fixes
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
Diffstat (limited to 'arch/arm/mach-omap2/mux.c')
| -rw-r--r-- | arch/arm/mach-omap2/mux.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index 4b46b91cca5c..9fe6829f4c16 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c @@ -41,6 +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 |