summaryrefslogtreecommitdiffstats
path: root/include/asm-um
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 21:01:37 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2008-07-25 21:01:37 +0200
commit762b8291be6944bd891fbe2c8976a2b2e5bbc726 (patch)
tree4ce2572c050d473bd8dcde8bfbaad0ab830b1b1c /include/asm-um
parentbootmem: Move node allocation macros back to !HAVE_ARCH_BOOTMEM_NODE (diff)
parentremove dummy asm/kvm.h files (diff)
downloadlinux-762b8291be6944bd891fbe2c8976a2b2e5bbc726.tar.xz
linux-762b8291be6944bd891fbe2c8976a2b2e5bbc726.zip
Merge git://git.infradead.org/~dwmw2/random-2.6
* git://git.infradead.org/~dwmw2/random-2.6: remove dummy asm/kvm.h files firmware: create firmware binaries during 'make modules'.
Diffstat (limited to 'include/asm-um')
-rw-r--r--include/asm-um/kvm.h6
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-um/kvm.h b/include/asm-um/kvm.h
deleted file mode 100644
index 66aa77094551..000000000000
--- a/include/asm-um/kvm.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __LINUX_KVM_UM_H
-#define __LINUX_KVM_UM_H
-
-/* um does not support KVM */
-
-#endif