diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 14:53:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 14:53:48 -0400 |
| commit | 7cc47662197b3050a974a6c6aed52291bb38ded0 (patch) | |
| tree | dd95d15aa97a3357d3789eba6848f0f888411bec /arch/ia64/include/asm/Kbuild | |
| parent | 55a6fbf8fc57d7b60d5028663f534475c4965215 (diff) | |
| parent | 27f70c3117194f98beb009dc48bb2aa267f505bf (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Convert ia64 to use int-ll64.h
[IA64] Fix build error in paravirt_patchlist.c
[IA64] ia64 does not need umount2() syscall
[IA64] hook up new rt_tgsigqueueinfo syscall
[IA64] msi_ia64.c dmar_msi_type should be static
[IA64] remove obsolete hw_interrupt_type
[IA64] remove obsolete irq_desc_t typedef
[IA64] remove obsolete no_irq_type
[IA64] unexport fpswa.h
Diffstat (limited to 'arch/ia64/include/asm/Kbuild')
| -rw-r--r-- | arch/ia64/include/asm/Kbuild | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild index ccbe8ae47a61..c7d0a71b9242 100644 --- a/arch/ia64/include/asm/Kbuild +++ b/arch/ia64/include/asm/Kbuild | |||
| @@ -2,7 +2,6 @@ include include/asm-generic/Kbuild.asm | |||
| 2 | 2 | ||
| 3 | header-y += break.h | 3 | header-y += break.h |
| 4 | header-y += fpu.h | 4 | header-y += fpu.h |
| 5 | header-y += fpswa.h | ||
| 6 | header-y += ia64regs.h | 5 | header-y += ia64regs.h |
| 7 | header-y += intel_intrin.h | 6 | header-y += intel_intrin.h |
| 8 | header-y += perfmon_default_smpl.h | 7 | header-y += perfmon_default_smpl.h |