Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[wrt350n-kernel.git] / arch / h8300 / platform / h8300h / Makefile
blob9ceab259eee633049d540196a024f532b955e5f0
2 # Makefile for the linux kernel.
4 # Reuse any files we can from the H8/300H
7 <<<<<<< HEAD:arch/h8300/platform/h8300h/Makefile
8 obj-y := irq_pin.o ptrace_h8300h.o
9 =======
10 obj-y := irq.o ptrace_h8300h.o
11 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:arch/h8300/platform/h8300h/Makefile