diff options
| author | Dave Airlie <airlied@panoply-rh.(none)> | 2008-03-05 10:37:02 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@panoply-rh.(none)> | 2008-03-05 10:37:02 +1000 |
| commit | 43891ff2d0176f013796b3c2a340b7d379d703ee (patch) | |
| tree | 734cdcd6e6c36997f1db92d41b92e4557ebf13b1 /linux-core/drm_compat.h | |
| parent | 81db48536c9d7bb23c448af6a6f1de81df755585 (diff) | |
| parent | a6a2f2c8c491617de702dc7d62bb55cbada4d42b (diff) | |
Merge remote branch 'origin/master' into modesetting-101
Conflicts:
linux-core/drm_compat.c
Diffstat (limited to 'linux-core/drm_compat.h')
| -rw-r--r-- | linux-core/drm_compat.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index f5f06017..86f1159a 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -343,4 +343,9 @@ 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 #endif |