diff options
| author | Kristian Høgsberg <krh@redhat.com> | 2008-07-31 15:18:32 -0400 |
|---|---|---|
| committer | Kristian Høgsberg <krh@redhat.com> | 2008-07-31 15:18:32 -0400 |
| commit | 5052e966ec7fe5146c2d73b90482003619add5da (patch) | |
| tree | a48e771871fd64a2892f5ce75e6e309b03db5e06 /bsd-core/i915/Makefile | |
| parent | 6d4e147480a334d32fa59c7fde53e10d7ab6e106 (diff) | |
| parent | 95c02743c96ca9e959f68a6e942206bdfadae53a (diff) | |
Merge commit 'origin/master' into modesetting-gem
Conflicts:
linux-core/Makefile.kernel
linux-core/ati_pcigart.c
linux-core/drm_compat.h
linux-core/drm_irq.c
linux-core/drm_lock.c
linux-core/i915_drv.c
shared-core/i915_dma.c
shared-core/i915_drv.h
shared-core/i915_irq.c
shared-core/nouveau_mem.c
shared-core/radeon_cp.c
shared-core/radeon_drv.h
Diffstat (limited to 'bsd-core/i915/Makefile')
| -rw-r--r-- | bsd-core/i915/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bsd-core/i915/Makefile b/bsd-core/i915/Makefile index 6fd7d728..f88155a5 100644 --- a/bsd-core/i915/Makefile +++ b/bsd-core/i915/Makefile @@ -3,7 +3,7 @@ .PATH: ${.CURDIR}/.. KMOD = i915 NO_MAN = YES -SRCS = i915_dma.c i915_drv.c i915_irq.c i915_mem.c +SRCS = i915_dma.c i915_drv.c i915_irq.c i915_mem.c i915_suspend.c SRCS += device_if.h bus_if.h pci_if.h opt_drm.h CFLAGS += ${DEBUG_FLAGS} -I. -I.. |