git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
POWERPC: Move generic cpm2 stuff to powerpc
[safe/jmp/linux-2.6]
/
arch
/
powerpc
/
sysdev
/
Makefile
diff --git
a/arch/powerpc/sysdev/Makefile
b/arch/powerpc/sysdev/Makefile
index
e5e999e
..
f15f4d7
100644
(file)
--- a/
arch/powerpc/sysdev/Makefile
+++ b/
arch/powerpc/sysdev/Makefile
@@
-17,3
+17,8
@@
ifeq ($(CONFIG_PPC_MERGE),y)
obj-$(CONFIG_PPC_I8259) += i8259.o
obj-$(CONFIG_PPC_83xx) += ipic.o
endif
+
+# Temporary hack until we have migrated to asm-powerpc
+ifeq ($(ARCH),powerpc)
+obj-$(CONFIG_CPM2) += cpm2_common.o cpm2_pic.o
+endif