summaryrefslogtreecommitdiffstats
path: root/arch/ia64/include/asm/Kbuild
diff options
context:
space:
mode:
authorTony Lindgren2012-11-09 23:58:01 +0100
committerTony Lindgren2012-11-09 23:58:01 +0100
commitedf8dde393f879fc2d8c22d4bc01ff8d37b80e1a (patch)
tree61425adc8b2059a9c12a3ce66ba7361fea1b0bb3 /arch/ia64/include/asm/Kbuild
parentARM: OMAP: Remove omap_init_consistent_dma_size() (diff)
parentLinux 3.7-rc4 (diff)
downloadkernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.gz
kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.tar.xz
kernel-qcow2-linux-edf8dde393f879fc2d8c22d4bc01ff8d37b80e1a.zip
Merge branch 'linus' into omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3
Diffstat (limited to 'arch/ia64/include/asm/Kbuild')
-rw-r--r--arch/ia64/include/asm/Kbuild1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index 4a159da23633..dd02f09b6eda 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -1,3 +1,4 @@
generic-y += clkdev.h
generic-y += exec.h
+generic-y += kvm_para.h