diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-04-18 13:07:43 -0400 |
| commit | d5381e42f64ca19f05c5799ffae5708acb6ed411 (patch) | |
| tree | 8b5e757a9847047102c475c6c583afc191d02e5b /arch/arm/plat-spear/include/plat/clock.h | |
| parent | f030d60b30855e18ac5bf080fa9e576147623d18 (diff) | |
| parent | b3c27b51db9112d03864fdef44fa611dd69c1425 (diff) | |
ASoC: Merge branch 'for-2.6.39' into for-2.6.40
Fix trivial conflict caused by silly spelling fix patch.
Conflicts:
sound/soc/codecs/wm8994.c
Diffstat (limited to 'arch/arm/plat-spear/include/plat/clock.h')
| -rw-r--r-- | arch/arm/plat-spear/include/plat/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-spear/include/plat/clock.h b/arch/arm/plat-spear/include/plat/clock.h index 2ae6606930a6..fcc0d0ad4a1f 100644 --- a/arch/arm/plat-spear/include/plat/clock.h +++ b/arch/arm/plat-spear/include/plat/clock.h | |||
| @@ -89,7 +89,7 @@ struct rate_config { | |||
| 89 | * @sibling: node for list of clocks having same parents | 89 | * @sibling: node for list of clocks having same parents |
| 90 | * @private_data: clock specific private data | 90 | * @private_data: clock specific private data |
| 91 | * @node: list to maintain clocks linearly | 91 | * @node: list to maintain clocks linearly |
| 92 | * @cl: clocklook up assoicated with this clock | 92 | * @cl: clocklook up associated with this clock |
| 93 | * @dent: object for debugfs | 93 | * @dent: object for debugfs |
| 94 | */ | 94 | */ |
| 95 | struct clk { | 95 | struct clk { |