diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:07:57 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-15 17:07:57 -0400 |
| commit | e7051e9dab77ddeaddbe12364939ae239d92ca73 (patch) | |
| tree | b1855cb663f64a374277df1a909cbac1ecf15fbf /arch/arm/mach-omap2/mux.c | |
| parent | 38abdcd0d0689aaca94e740ac67a952c7918caef (diff) | |
| parent | 5da30bb6d902a36265e74f7141a904b19ec25bd4 (diff) | |
Merge branch 'samsung/exynos5' into next/soc2
Diffstat (limited to 'arch/arm/mach-omap2/mux.c')
| -rw-r--r-- | arch/arm/mach-omap2/mux.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/mux.c b/arch/arm/mach-omap2/mux.c index fb8bc9fa43b1..611a0e3d54ca 100644 --- a/arch/arm/mach-omap2/mux.c +++ b/arch/arm/mach-omap2/mux.c | |||
| @@ -218,7 +218,7 @@ static int _omap_mux_get_by_name(struct omap_mux_partition *partition, | |||
| 218 | return -ENODEV; | 218 | return -ENODEV; |
| 219 | } | 219 | } |
| 220 | 220 | ||
| 221 | static int __init | 221 | static int |
| 222 | omap_mux_get_by_name(const char *muxname, | 222 | omap_mux_get_by_name(const char *muxname, |
| 223 | struct omap_mux_partition **found_partition, | 223 | struct omap_mux_partition **found_partition, |
| 224 | struct omap_mux **found_mux) | 224 | struct omap_mux **found_mux) |