diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:49:30 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-15 06:49:30 +0000 |
| commit | c94f28c383f58c9de74678e0f1624db9c5f8a8cb (patch) | |
| tree | 3281184f026cb79cee6c20fe29c994ba654cbbe4 /drivers/char/ip2/Makefile | |
| parent | df15315899c0641412bd54b29565a70b078a6ac8 (diff) | |
| parent | 1bb95834bbcdc969e477a9284cf96c17a4c2616f (diff) | |
| download | blackbird-op-linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.tar.gz blackbird-op-linux-c94f28c383f58c9de74678e0f1624db9c5f8a8cb.zip | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/intel_ringbuffer.c
Diffstat (limited to 'drivers/char/ip2/Makefile')
| -rw-r--r-- | drivers/char/ip2/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/ip2/Makefile b/drivers/char/ip2/Makefile index bc397d92b499..7b78e0dfc5b0 100644 --- a/drivers/char/ip2/Makefile +++ b/drivers/char/ip2/Makefile @@ -4,5 +4,5 @@ obj-$(CONFIG_COMPUTONE) += ip2.o -ip2-objs := ip2main.o +ip2-y := ip2main.o |
