summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 08:35:28 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-15 08:35:28 -0700
commitbcf559e385ba099996c90469c817d2eb38aba418 (patch)
tree7088c23a2c7cb6d0b8c40aa83f326c811bf3c05b /include
parent732b72069e77f288efa1d5245cc699d7cb98e528 (diff)
parent242e3df80b8d25ed681c278512df0993725f25dd (diff)
downloadlinux-3.10-bcf559e385ba099996c90469c817d2eb38aba418.tar.gz
linux-3.10-bcf559e385ba099996c90469c817d2eb38aba418.tar.bz2
linux-3.10-bcf559e385ba099996c90469c817d2eb38aba418.zip
Merge branch 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6
* 'drm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: drm/radeon: fixup issue with radeon and PAT support.
Diffstat (limited to 'include')
-rw-r--r--include/drm/drmP.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/drm/drmP.h b/include/drm/drmP.h
index 0764b662b33..1c1b13e2922 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);
extern int drm_mm_add_space_to_tail(struct drm_mm *mm, unsigned long size);
extern void drm_core_ioremap(struct drm_map *map, struct drm_device *dev);
+extern void drm_core_ioremap_wc(struct drm_map *map, struct drm_device *dev);
extern void drm_core_ioremapfree(struct drm_map *map, struct drm_device *dev);
static __inline__ struct drm_map *drm_core_findmap(struct drm_device *dev,