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 'bzip2-lzma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[sfrench/cifs-2.6.git]
/
arch
/
sh
/
drivers
/
dma
/
Makefile
diff --git
a/arch/sh/drivers/dma/Makefile
b/arch/sh/drivers/dma/Makefile
index cff52cb6ac71c672324a63b07788deaab8cbfa35..c6068137b46f42aa13f8491a3a8a298a4514d01b 100644
(file)
--- a/
arch/sh/drivers/dma/Makefile
+++ b/
arch/sh/drivers/dma/Makefile
@@
-4,6
+4,6
@@
obj-$(CONFIG_SH_DMA_API) += dma-api.o dma-sysfs.o
obj-$(CONFIG_SH_DMA) += dma-sh.o
-obj-$(CONFIG_SH_DREAMCAST) += dma-g2.o
obj-$(CONFIG_PVR2_DMA) += dma-pvr2.o
+obj-$(CONFIG_G2_DMA) += dma-g2.o
obj-$(CONFIG_SH_DMABRG) += dmabrg.o