Merge branch 'linux-2.6'

[sfrench/cifs-2.6.git] / arch / powerpc / platforms / 44x / Makefile

diff --git a/arch/powerpc/platforms/44x/Makefile b/arch/powerpc/platforms/44x/Makefile
index a2a0dc13e9e9923e48496d6d83a1f51f5fc07902..2320ae5dc8a76c76e0443bd9d9051495ef861947 100644 (file)
--- a/arch/powerpc/platforms/44x/Makefile
+++ b/arch/powerpc/platforms/44x/Makefile
@@ -2,6 +2,10 @@ obj-$(CONFIG_44x)      := misc_44x.o
 obj-$(CONFIG_EBONY)    += ebony.o
 obj-$(CONFIG_TAISHAN)  += taishan.o
 obj-$(CONFIG_BAMBOO)   += bamboo.o
+obj-$(CONFIG_YOSEMITE) += bamboo.o
 obj-$(CONFIG_SEQUOIA)  += sequoia.o
 obj-$(CONFIG_KATMAI)   += katmai.o
 obj-$(CONFIG_RAINIER)  += rainier.o
+obj-$(CONFIG_WARP)     += warp.o
+obj-$(CONFIG_WARP)     += warp-nand.o
+obj-$(CONFIG_CANYONLANDS) += canyonlands.o