diff options
| author | Dave Airlie <airlied@linux.ie> | 2006-12-19 20:29:03 +1100 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2006-12-19 20:29:03 +1100 |
| commit | 86ff2aeb9bfea357d5748b3587ab224e813b37b6 (patch) | |
| tree | 7cc4afd1293c491e3074f6c1af339773136f6156 /linux-core/drmP.h | |
| parent | 656c3a3737180d507bec352d56fbd9ef8b8a4feb (diff) | |
drm: remove all 2.4 support for drm development tree.
Bye bye 2.4 you served us well..
Diffstat (limited to 'linux-core/drmP.h')
| -rw-r--r-- | linux-core/drmP.h | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/linux-core/drmP.h b/linux-core/drmP.h index 5827efba..c19b6afb 100644 --- a/linux-core/drmP.h +++ b/linux-core/drmP.h @@ -70,16 +70,7 @@ #include <linux/types.h> #include <linux/agp_backend.h> #endif -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,41) -#define HAS_WORKQUEUE 0 -#else -#define HAS_WORKQUEUE 1 -#endif -#if !HAS_WORKQUEUE -#include <linux/tqueue.h> -#else #include <linux/workqueue.h> -#endif #include <linux/poll.h> #include <asm/pgalloc.h> #include "drm.h" @@ -897,11 +888,8 @@ typedef struct drm_device { unsigned long last_switch; /**< jiffies at last context switch */ /*@} */ -#if !HAS_WORKQUEUE - struct tq_struct tq; -#else struct work_struct work; -#endif + /** \name VBLANK IRQ support */ /*@{ */ @@ -929,12 +917,8 @@ typedef struct drm_device { int pci_vendor; /**< PCI vendor id */ int pci_device; /**< PCI device id */ #ifdef __alpha__ -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,3) - struct pci_controler *hose; -#else struct pci_controller *hose; #endif -#endif drm_sg_mem_t *sg; /**< Scatter gather memory */ unsigned long *ctx_bitmap; /**< context bitmap */ void *dev_private; /**< device private data */ |