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 git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
platforms
/
Makefile
diff --git
a/arch/powerpc/platforms/Makefile
b/arch/powerpc/platforms/Makefile
index 8079e0b4fd69a14a0bde12cd2dfed65732b3bdbd..f7419198e63531aec1138b4852c4525fb198e60e 100644
(file)
--- a/
arch/powerpc/platforms/Makefile
+++ b/
arch/powerpc/platforms/Makefile
@@
-19,3
+19,4
@@
obj-$(CONFIG_PPC_PASEMI) += pasemi/
obj-$(CONFIG_PPC_CELL) += cell/
obj-$(CONFIG_PPC_PS3) += ps3/
obj-$(CONFIG_EMBEDDED6xx) += embedded6xx/
+obj-$(CONFIG_AMIGAONE) += amigaone/