diff options
| author | Dima Zavin <dima@android.com> | 2011-06-27 19:21:05 -0700 |
|---|---|---|
| committer | Dima Zavin <dima@android.com> | 2011-06-27 19:21:05 -0700 |
| commit | 07367d95a03c2d584201b2a18fa0b34357b04ab6 (patch) | |
| tree | 5b79ec0d53ae383952853cbf6b22dbd49c89d1fe /arch/arm/mach-omap2/omap_hwmod_44xx_data.c | |
| parent | 061bec641decba07eb325ce9afef32fa8a7dfed7 (diff) | |
| parent | f0d45f697629dfe2866b562481c46fc5973eb6dc (diff) | |
| download | kernel_samsung_tuna-07367d95a03c2d584201b2a18fa0b34357b04ab6.zip kernel_samsung_tuna-07367d95a03c2d584201b2a18fa0b34357b04ab6.tar.gz kernel_samsung_tuna-07367d95a03c2d584201b2a18fa0b34357b04ab6.tar.bz2 | |
Merge branch 'linux-omap-pm-3.0' into linux-omap-3.0
Diffstat (limited to 'arch/arm/mach-omap2/omap_hwmod_44xx_data.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod_44xx_data.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c index 196b276..5fcd435 100644 --- a/arch/arm/mach-omap2/omap_hwmod_44xx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_44xx_data.c @@ -1424,8 +1424,7 @@ static struct omap_hwmod_class_sysconfig omap44xx_dss_sysc = { .sysc_flags = SYSS_HAS_RESET_STATUS, }; -static int omap44xx_dss_reset(struct omap_hwmod *oh) -{ +int omap44xx_dss_reset(struct omap_hwmod *oh) { omap_hwmod_write(0x0, oh, 0x40); return 0; } |