diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2015-08-20 14:54:23 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2015-08-28 12:40:49 +1000 |
| commit | 340b0e7c500a0ac8fb649c58cf8528550642c1d8 (patch) | |
| tree | 5d0e79108aee9874fd4eabdb138cf7415ad770c0 /drivers/gpu/drm/nouveau/Kbuild | |
| parent | 26c9e8effebb9166eb1cfba2d164676e98c505c7 (diff) | |
| download | linux-340b0e7c500a0ac8fb649c58cf8528550642c1d8.tar.gz linux-340b0e7c500a0ac8fb649c58cf8528550642c1d8.tar.bz2 linux-340b0e7c500a0ac8fb649c58cf8528550642c1d8.zip | |
drm/nouveau/pci: merge agp handling from nouveau drm
This commit reinstates the pre-DEVINIT AGP fiddling that was broken in
an earlier commit.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/Kbuild')
| -rw-r--r-- | drivers/gpu/drm/nouveau/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/Kbuild b/drivers/gpu/drm/nouveau/Kbuild index 2b765663c1a3..a34b437dbc8f 100644 --- a/drivers/gpu/drm/nouveau/Kbuild +++ b/drivers/gpu/drm/nouveau/Kbuild @@ -18,7 +18,6 @@ nouveau-y += $(nvkm-y) ifdef CONFIG_X86 nouveau-$(CONFIG_ACPI) += nouveau_acpi.o endif -nouveau-y += nouveau_agp.o nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o nouveau-y += nouveau_drm.o nouveau-y += nouveau_hwmon.o |