diff options
| author | Keith Packard <keithp@keithp.com> | 2008-05-05 14:40:20 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2008-05-05 14:40:20 -0700 |
| commit | 5b0d0fa7f81fb297778af97124a2273b2af317bb (patch) | |
| tree | 29e9d8b79f14a250f48218f3a85782e1b9e4583f /linux-core/drmP.h | |
| parent | d59a9300ec2ec5d6dc606f847a7589c197994793 (diff) | |
| parent | dafe48e6239a4e9b49dd87b8c70224e8eeeb6079 (diff) | |
Merge commit 'anholt/drm-gem' into drm-gem
Conflicts:
linux-core/i915_gem.c
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 21a4dcd0..ffeafc18 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -1315,10 +1315,6 @@ extern int drm_memrange_remove_space_from_tail(struct drm_memrange *mm, unsigned long size); extern int drm_memrange_add_space_to_tail(struct drm_memrange *mm, unsigned long size); -extern int drm_memrange_for_each(struct drm_memrange *mm, - int (*callback)(struct drm_memrange_node *node, - void *data), - void *data); static inline struct drm_memrange *drm_get_mm(struct drm_memrange_node *block) { |