git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid
[sfrench/cifs-2.6.git]
/
drivers
/
gpu
/
drm
/
radeon
/
Makefile
diff --git
a/drivers/gpu/drm/radeon/Makefile
b/drivers/gpu/drm/radeon/Makefile
index feb521ebc3935522d869de263927151c763a1424..52ce439a0f2e77d5562056b6f58180cc90e7e5ca 100644
(file)
--- a/
drivers/gpu/drm/radeon/Makefile
+++ b/
drivers/gpu/drm/radeon/Makefile
@@
-3,7
+3,7
@@
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
ccflags-y := -Iinclude/drm
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.
ccflags-y := -Iinclude/drm
-radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
+radeon-y := radeon_drv.o radeon_cp.o radeon_state.o radeon_mem.o radeon_irq.o r300_cmdbuf.o
r600_cp.o
radeon-$(CONFIG_COMPAT) += radeon_ioc32.o
radeon-$(CONFIG_COMPAT) += radeon_ioc32.o