diff options
| author | Nian Wu <nian.wu@intel.com> | 2007-03-12 09:03:40 +0800 |
|---|---|---|
| committer | Nian Wu <nian.wu@intel.com> | 2007-03-12 09:03:40 +0800 |
| commit | ab75d50d6ca72615259e4fa857effeb6192c28a9 (patch) | |
| tree | a4ebd36df847bea9a06da5d458d767d93111f170 /linux-core | |
| parent | b36972407747154abc0c5f2cdcf3b8ddbba4ff2e (diff) | |
| parent | 0cd5c650d1bb36e0ba6b40abd1da1459d1a767f0 (diff) | |
Merge git://proxy01.pd.intel.com:9419/git/mesa/drm into crestline
Diffstat (limited to 'linux-core')
| -rw-r--r-- | linux-core/drm_compat.h | 4 | ||||
| -rw-r--r-- | linux-core/drm_irq.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/linux-core/drm_compat.h b/linux-core/drm_compat.h index bf5899fb..bc5fadc5 100644 --- a/linux-core/drm_compat.h +++ b/linux-core/drm_compat.h @@ -97,6 +97,10 @@ #define __GFP_COMP 0 #endif +#if !defined(IRQF_SHARED) +#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) { diff --git a/linux-core/drm_irq.c b/linux-core/drm_irq.c index 92cf7f5c..3e7c9c77 100644 --- a/linux-core/drm_irq.c +++ b/linux-core/drm_irq.c @@ -131,7 +131,7 @@ static int drm_irq_install(drm_device_t * dev) /* Install handler */ if (drm_core_check_feature(dev, DRIVER_IRQ_SHARED)) - sh_flags = SA_SHIRQ; + sh_flags = IRQF_SHARED; ret = request_irq(dev->irq, dev->driver->irq_handler, sh_flags, dev->devname, dev); |