diff options
| author | Xiang, Haihao <haihao.xiang@intel.com> | 2007-01-16 09:49:20 +0800 |
|---|---|---|
| committer | Xiang, Haihao <haihao.xiang@intel.com> | 2007-01-16 09:49:20 +0800 |
| commit | 9f5cda44dbf5b8f3c7cc00b8a58eee2690a864e6 (patch) | |
| tree | b92c293d743846a23e145bdd6e76a2e7076fae85 /linux-core/nouveau_drv.c | |
| parent | 6ac742d95dfd717ae730035da34624682c652b7b (diff) | |
| parent | fdbc34fab03eba8d257e14c6d557ffed5fa32c2d (diff) | |
Merge branch 'master' into crestline
Diffstat (limited to 'linux-core/nouveau_drv.c')
| -rw-r--r-- | linux-core/nouveau_drv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c index 91de2b31..ac030d89 100644 --- a/linux-core/nouveau_drv.c +++ b/linux-core/nouveau_drv.c @@ -38,7 +38,7 @@ extern int nouveau_max_ioctl; static int probe(struct pci_dev *pdev, const struct pci_device_id *ent); static struct drm_driver driver = { .driver_features = - DRIVER_USE_AGP | DRIVER_USE_MTRR | DRIVER_PCI_DMA | DRIVER_SG | + DRIVER_USE_AGP | DRIVER_PCI_DMA | DRIVER_SG | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED, .load = nouveau_load, .firstopen = nouveau_firstopen, |