include/asm-ia64/Kbuild

   1 include include/asm-generic/Kbuild.asm
   2
   3 header-y += break.h
   4 header-y += fpu.h
   5 header-y += fpswa.h
   6 <<<<<<< HEAD:include/asm-ia64/Kbuild
   7 header-y += gcc_intrin.h
   8 =======
   9 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/asm-ia64/Kbuild
  10 header-y += ia64regs.h
  11 header-y += intel_intrin.h
  12 header-y += intrinsics.h
  13 header-y += perfmon_default_smpl.h
  14 header-y += ptrace_offsets.h
  15 header-y += rse.h
  16 header-y += ucontext.h
  17
  18 <<<<<<< HEAD:include/asm-ia64/Kbuild
  19 =======
  20 unifdef-y += gcc_intrin.h
  21 >>>>>>> 264e3e889d86e552b4191d69bb60f4f3b383135a:include/asm-ia64/Kbuild
  22 unifdef-y += perfmon.h
  23 unifdef-y += ustack.h