diff options
| author | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-22 19:49:27 -0400 |
|---|---|---|
| committer | Anton Vorontsov <avorontsov@ru.mvista.com> | 2009-09-22 19:49:27 -0400 |
| commit | f056878332a91ed984a116bad4e7d49aefff9e6e (patch) | |
| tree | 572f4757c8e7811d45e0be0c2ae529c78fb63441 /include/drm/drm_mm.h | |
| parent | 3961f7c3cf247eee5df7fabadc7a40f2deeb98f3 (diff) | |
| parent | 7fa07729e439a6184bd824746d06a49cca553f15 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/power/wm97xx_battery.c
Diffstat (limited to 'include/drm/drm_mm.h')
| -rw-r--r-- | include/drm/drm_mm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index f8332073d277..62329f9a42cb 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h | |||
| @@ -37,6 +37,9 @@ | |||
| 37 | * Generic range manager structs | 37 | * Generic range manager structs |
| 38 | */ | 38 | */ |
| 39 | #include <linux/list.h> | 39 | #include <linux/list.h> |
| 40 | #ifdef CONFIG_DEBUG_FS | ||
| 41 | #include <linux/seq_file.h> | ||
| 42 | #endif | ||
| 40 | 43 | ||
| 41 | struct drm_mm_node { | 44 | struct drm_mm_node { |
| 42 | struct list_head fl_entry; | 45 | struct list_head fl_entry; |
| @@ -96,4 +99,8 @@ static inline struct drm_mm *drm_get_mm(struct drm_mm_node *block) | |||
| 96 | return block->mm; | 99 | return block->mm; |
| 97 | } | 100 | } |
| 98 | 101 | ||
| 102 | #ifdef CONFIG_DEBUG_FS | ||
| 103 | int drm_mm_dump_table(struct seq_file *m, struct drm_mm *mm); | ||
| 104 | #endif | ||
| 105 | |||
| 99 | #endif | 106 | #endif |