diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-10 15:47:28 -0800 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-12-10 15:50:22 -0800 |
| commit | 9583c099b4a08b49e03f7b461c344b6d277fd262 (patch) | |
| tree | e3c17d4b9ee2c2a063c3e30e0a650fc0c9b6cfa7 /linux-core/nouveau_drv.c | |
| parent | c34539e8bb5568b1d6059abf139dd08e07e84eea (diff) | |
Revert "Merge branch 'modesetting-gem'"
This reverts commit 6656db10551bbb8770dd945b6d81d5138521f208.
We really just want the libdrm and ioctl bits, not all the driver
stuff.
Diffstat (limited to 'linux-core/nouveau_drv.c')
| -rw-r--r-- | linux-core/nouveau_drv.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/linux-core/nouveau_drv.c b/linux-core/nouveau_drv.c index 04f002f2..c8f57dff 100644 --- a/linux-core/nouveau_drv.c +++ b/linux-core/nouveau_drv.c @@ -28,9 +28,6 @@ #include "drm_pciids.h" -unsigned int nouveau_modeset = 0; /* kms */ -module_param_named(modeset, nouveau_modeset, int, 0400); - static struct pci_device_id pciidlist[] = { { PCI_DEVICE(PCI_VENDOR_ID_NVIDIA, PCI_ANY_ID), @@ -107,10 +104,6 @@ static int probe(struct pci_dev *pdev, const struct pci_device_id *ent) static int __init nouveau_init(void) { driver.num_ioctls = nouveau_max_ioctl; - - if (nouveau_modeset == 1) - driver.driver_features |= DRIVER_MODESET; - return drm_init(&driver, pciidlist); } |