Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband
[linux-2.6] / arch / powerpc / platforms / Makefile
1 ifeq ($(CONFIG_PPC_MERGE),y)
2 obj-$(CONFIG_PPC_PMAC)          += powermac/
3 else
4 ifeq ($(CONFIG_PPC64),y)
5 obj-$(CONFIG_PPC_PMAC)          += powermac/
6 endif
7 endif
8 obj-$(CONFIG_PPC_CHRP)          += chrp/
9 obj-$(CONFIG_4xx)               += 4xx/
10 obj-$(CONFIG_85xx)              += 85xx/
11 obj-$(CONFIG_PPC_PSERIES)       += pseries/
12 obj-$(CONFIG_PPC_ISERIES)       += iseries/
13 obj-$(CONFIG_PPC_MAPLE)         += maple/
14 obj-$(CONFIG_PPC_CELL)          += cell/