Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / arch / powerpc / platforms / pasemi / Makefile
blobaad4adfb70085be282cf7f61c7b0e983d508ca0c
1 <<<<<<< HEAD:arch/powerpc/platforms/pasemi/Makefile
2 obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o
3 =======
4 obj-y += setup.o pci.o time.o idle.o powersave.o iommu.o dma_lib.o misc.o
5 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/powerpc/platforms/pasemi/Makefile
6 obj-$(CONFIG_PPC_PASEMI_MDIO) += gpio_mdio.o
7 obj-$(CONFIG_PPC_PASEMI_CPUFREQ) += cpufreq.o