Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / arch / arm / mach-orion / Makefile
blob3bd47beb237e0f205fde9f68a50fada2ffd7666d
1 obj-y += common.o addr-map.o pci.o gpio.o irq.o time.o
2 obj-$(CONFIG_MACH_DB88F5281) += db88f5281-setup.o
3 obj-$(CONFIG_MACH_RD88F5182) += rd88f5182-setup.o
4 obj-$(CONFIG_MACH_KUROBOX_PRO) += kurobox_pro-setup.o
5 obj-$(CONFIG_MACH_DNS323) += dns323-setup.o
6 <<<<<<< HEAD:arch/arm/mach-orion/Makefile
7 obj-$(CONFIG_MACH_WRT350N_V2) += wrt350n_v2-setup.o
8 =======
9 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/arm/mach-orion/Makefile
10 obj-$(CONFIG_MACH_TS209) += ts209-setup.o