diff options
| author | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
|---|---|---|
| committer | Thomas Hellstrom <thomas-at-tungstengraphics-dot-com> | 2008-03-12 11:34:29 +0100 |
| commit | 88bd1e4a350d011ec44f6786e0bfdf8fb386800c (patch) | |
| tree | e78d09fe0eb28514aa060de05ba8aee298fd120e /linux-core/drm_compat.c | |
| parent | 2a618e5a7f6d26fe85e7d931d0ef08d9f18b1b7c (diff) | |
| parent | 612c22f131a25915196e69d7ec1adb6f4ec84a60 (diff) | |
Merge branch 'intel-post-reloc'
Conflicts:
linux-core/drm_compat.c
linux-core/drm_compat.h
linux-core/drm_ttm.c
shared-core/i915_dma.c
Bump driver minor to 13 due to introduction of new
relocation type.
Diffstat (limited to 'linux-core/drm_compat.c')
| -rw-r--r-- | linux-core/drm_compat.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/linux-core/drm_compat.c b/linux-core/drm_compat.c index d4044cbd..5dabeaea 100644 --- a/linux-core/drm_compat.c +++ b/linux-core/drm_compat.c @@ -730,7 +730,7 @@ void *idr_replace(struct idr *idp, void *ptr, int id) EXPORT_SYMBOL(idr_replace); #endif -#if defined(DRM_KMAP_ATOMIC_PROT_PFN) && defined(CONFIG_HIMEM) +#if defined(DRM_KMAP_ATOMIC_PROT_PFN) #define drm_kmap_get_fixmap_pte(vaddr) \ pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr), vaddr), (vaddr)), (vaddr)) @@ -758,5 +758,3 @@ void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, EXPORT_SYMBOL(kmap_atomic_prot_pfn); #endif - - |