git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'irq-threaded-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
arch
/
sparc
/
kernel
/
Makefile
diff --git
a/arch/sparc/kernel/Makefile
b/arch/sparc/kernel/Makefile
index
475ce46
..
29b88a5
100644
(file)
--- a/
arch/sparc/kernel/Makefile
+++ b/
arch/sparc/kernel/Makefile
@@
-61,7
+61,7
@@
obj-$(CONFIG_SPARC64_SMP) += cpumap.o
obj-$(CONFIG_SPARC32) += devres.o
devres-y := ../../../kernel/irq/devres.o
-obj-
$(CONFIG_SPARC32)
+= dma.o
+obj-
y
+= dma.o
obj-$(CONFIG_SPARC32_PCI) += pcic.o