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 master.kernel.org:/pub/scm/linux/kernel/git/steve/gfs2-2.6-nmw
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
Makefile
diff --git
a/arch/powerpc/kernel/Makefile
b/arch/powerpc/kernel/Makefile
index
600954d
..
4fe53d0
100644
(file)
--- a/
arch/powerpc/kernel/Makefile
+++ b/
arch/powerpc/kernel/Makefile
@@
-72,11
+72,11
@@
obj-$(CONFIG_AUDIT) += audit.o
obj64-$(CONFIG_AUDIT) += compat_audit.o
ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
obj64-$(CONFIG_AUDIT) += compat_audit.o
ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
-
pci64-$(CONFIG_PPC64)
+= iomap.o
+
obj-y
+= iomap.o
endif
ifeq ($(CONFIG_PPC_ISERIES),y)
endif
ifeq ($(CONFIG_PPC_ISERIES),y)
-
$(obj)/head_64.o: $(obj)/
lparmap.s
+
extra-y +=
lparmap.s
AFLAGS_head_64.o += -I$(obj)
endif
AFLAGS_head_64.o += -I$(obj)
endif