diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
|---|---|---|
| committer | John Doe <glisse@freedesktop.org> | 2008-03-10 23:36:27 +0100 |
| commit | a7e6ca62ad0d9c3c45fd9e1d81b59c2db2d714cf (patch) | |
| tree | 8f757eeaa2c234af14ca1df515de7810e770ed91 /linux-core/drm_compat.h | |
| parent | a7dc4d08b9b4f8fe6fcaa4c778f6dd3718d1e36a (diff) | |
| parent | 9f19e79f955281b9de393219e4ad9835ffe29c49 (diff) | |
Merge branch 'modesetting-101' of ssh://git.freedesktop.org/git/mesa/drm into modesetting-101
Diffstat (limited to 'linux-core/drm_compat.h')
| -rw-r--r-- | linux-core/drm_compat.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index f5f06017..03838a18 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -343,4 +343,14 @@ extern struct pci_dev * pci_get_bus_and_slot(unsigned int bus, unsigned int devf #define PM_EVENT_PRETHAW 3 #endif +#if (defined(CONFIG_X86) && defined(CONFIG_X86_32) && defined(CONFIG_HIMEM)) +#define DRM_KMAP_ATOMIC_PROT_PFN +extern void *kmap_atomic_prot_pfn(unsigned long pfn, enum km_type type, + pgprot_t protection); +#endif + +#if !defined(flush_agp_mappings) +#define flush_agp_mappings() do {} while(0) +#endif + #endif |