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 'linux-2.6' into for-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
kernel
/
Makefile
diff --git
a/arch/powerpc/kernel/Makefile
b/arch/powerpc/kernel/Makefile
index
82c2238
..
d8240ce
100644
(file)
--- a/
arch/powerpc/kernel/Makefile
+++ b/
arch/powerpc/kernel/Makefile
@@
-37,7
+37,6
@@
obj-$(CONFIG_6xx) += idle_6xx.o l2cr_6xx.o cpu_setup_6xx.o
obj-$(CONFIG_TAU) += tau_6xx.o
obj32-$(CONFIG_SOFTWARE_SUSPEND) += swsusp_32.o
obj32-$(CONFIG_MODULES) += module_32.o
-obj-$(CONFIG_E500) += perfmon_fsl_booke.o
ifeq ($(CONFIG_PPC_MERGE),y)