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 git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
arch
/
powerpc
/
platforms
/
44x
/
Makefile
diff --git
a/arch/powerpc/platforms/44x/Makefile
b/arch/powerpc/platforms/44x/Makefile
index
6981331
..
01f51da
100644
(file)
--- a/
arch/powerpc/platforms/44x/Makefile
+++ b/
arch/powerpc/platforms/44x/Makefile
@@
-3,5
+3,4
@@
obj-$(CONFIG_PPC44x_SIMPLE) += ppc44x_simple.o
obj-$(CONFIG_EBONY) += ebony.o
obj-$(CONFIG_SAM440EP) += sam440ep.o
obj-$(CONFIG_WARP) += warp.o
-obj-$(CONFIG_WARP) += warp-nand.o
obj-$(CONFIG_XILINX_VIRTEX_5_FXT) += virtex.o