diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-05-08 10:25:01 +1000 |
| commit | ef204fb5c24f9bd09192a9abebad6a06dd0b88db (patch) | |
| tree | a72ee9071462457b27475c2cc86e3c6256388ea9 /linux-core/drm_compat.c | |
| parent | 7f269bec7ed49385de394fdbd970f463ef2060f0 (diff) | |
| parent | b44f2da380e78769b58c751e81f376f0fa1f48aa (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/Makefile.kernel
shared-core/i915_drv.h
Diffstat (limited to 'linux-core/drm_compat.c')
| -rw-r--r-- | linux-core/drm_compat.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c index 8fa8ae02..2a761963 100644 --- a/linux-core/drm_compat.c +++ b/linux-core/drm_compat.c @@ -807,3 +807,4 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, EXPORT_SYMBOL(kmap_atomic_prot_pfn); #endif + |