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 /include/drm/drm_mm.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 'include/drm/drm_mm.h')
| -rw-r--r-- | include/drm/drm_mm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index b1e7809e5e15..c2f93a8ae2e1 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h | |||
| @@ -56,7 +56,7 @@ struct drm_mm_node { | |||
| 56 | }; | 56 | }; |
| 57 | 57 | ||
| 58 | struct drm_mm { | 58 | struct drm_mm { |
| 59 | /* List of all memory nodes that immediatly preceed a free hole. */ | 59 | /* List of all memory nodes that immediately precede a free hole. */ |
| 60 | struct list_head hole_stack; | 60 | struct list_head hole_stack; |
| 61 | /* head_node.node_list is the list of all memory nodes, ordered | 61 | /* head_node.node_list is the list of all memory nodes, ordered |
| 62 | * according to the (increasing) start address of the memory node. */ | 62 | * according to the (increasing) start address of the memory node. */ |