diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /include/drm/drmP.h | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'include/drm/drmP.h')
| -rw-r--r-- | include/drm/drmP.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 0764b662b339..1c1b13e29223 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h | |||
| @@ -1089,6 +1089,7 @@ extern int drm_mm_remove_space_from_tail(struct drm_mm *mm, unsigned long size); | |||
| 1089 | extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size); | 1089 | extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size); |
| 1090 | 1090 | ||
| 1091 | extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev); | 1091 | extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev); |
| 1092 | extern void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev); | ||
| 1092 | extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev); | 1093 | extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev); |
| 1093 | 1094 | ||
| 1094 | static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev, | 1095 | static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev, |