diff options
| author | Pekka Paalanen <pq@iki.fi> | 2009-03-02 00:17:44 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pq@iki.fi> | 2009-03-02 00:21:09 +0200 |
| commit | 4c439ac4a7fa627691dfcd6a4be67cd95d8d33ee (patch) | |
| tree | 0a4eee14b453def235ae51d9a292d5b5c518195d | |
| parent | 4bdddf57155a774318ed3739ede9511f074d394e (diff) | |
drm: drop Linux < 2.6.10 support
Signed-off-by: Pekka Paalanen <pq@iki.fi>
| -rw-r--r-- | linux-core/drm_compat.h | 21 | ||||
| -rw-r--r-- | linux-core/mga_drv.c | 2 | ||||
| -rw-r--r-- | linux-core/nouveau_drv.c | 2 | ||||
| -rw-r--r-- | linux-core/r128_drv.c | 2 | ||||
| -rw-r--r-- | linux-core/radeon_drv.c | 2 | ||||
| -rw-r--r-- | linux-core/xgi_drv.c | 2 |
6 files changed, 5 insertions, 26 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index a5673563..937908aa 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -107,27 +107,6 @@ #define IRQF_SHARED SA_SHIRQ #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10) -static inline int remap_pfn_range(struct vm_area_struct *vma, unsigned long from, unsigned long pfn, unsigned long size, pgprot_t pgprot) -{ - return remap_page_range(vma, from, - pfn << PAGE_SHIFT, - size, - pgprot); -} - -static __inline__ void *kcalloc(size_t nmemb, size_t size, int flags) -{ - void *addr; - - addr = kmalloc(size * nmemb, flags); - if (addr != NULL) - memset((void *)addr, 0, size * nmemb); - - return addr; -} -#endif - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,16) #define mutex_lock down #define mutex_unlock up diff --git a/linux-core/mga_drv.c b/linux-core/mga_drv.c index 14a0be45..ce498574 100644 --- a/linux-core/mga_drv.c +++ b/linux-core/mga_drv.c @@ -73,7 +73,7 @@ static struct drm_driver driver = { .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, -#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +#if defined(CONFIG_COMPAT) .compat_ioctl = mga_compat_ioctl, #endif }, diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c index c8f57dff..b31485a8 100644 --- a/linux-core/nouveau_drv.c +++ b/linux-core/nouveau_drv.c @@ -70,7 +70,7 @@ static struct drm_driver driver = { .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, -#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +#if defined(CONFIG_COMPAT) .compat_ioctl = nouveau_compat_ioctl, #endif }, diff --git a/linux-core/r128_drv.c b/linux-core/r128_drv.c index 7b6159b9..111fe711 100644 --- a/linux-core/r128_drv.c +++ b/linux-core/r128_drv.c @@ -68,7 +68,7 @@ static struct drm_driver driver = { .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, -#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +#if defined(CONFIG_COMPAT) .compat_ioctl = r128_compat_ioctl, #endif }, diff --git a/linux-core/radeon_drv.c b/linux-core/radeon_drv.c index 934fa0b9..902bdc23 100644 --- a/linux-core/radeon_drv.c +++ b/linux-core/radeon_drv.c @@ -114,7 +114,7 @@ static struct drm_driver driver = { .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, -#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +#if defined(CONFIG_COMPAT) .compat_ioctl = radeon_compat_ioctl, #endif }, diff --git a/linux-core/xgi_drv.c b/linux-core/xgi_drv.c index bfe9acdf..51ace0ff 100644 --- a/linux-core/xgi_drv.c +++ b/linux-core/xgi_drv.c @@ -93,7 +93,7 @@ static struct drm_driver driver = { .mmap = drm_mmap, .poll = drm_poll, .fasync = drm_fasync, -#if defined(CONFIG_COMPAT) && LINUX_VERSION_CODE > KERNEL_VERSION(2,6,9) +#if defined(CONFIG_COMPAT) .compat_ioctl = xgi_compat_ioctl, #endif }, |