git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kvm
/
i8254.c
diff --git
a/arch/x86/kvm/i8254.c
b/arch/x86/kvm/i8254.c
index 294698b6daff60c288dcd1304470ab7c6254000f..0150affad25d082c4dd8eea9546b30ee12491731 100644
(file)
--- a/
arch/x86/kvm/i8254.c
+++ b/
arch/x86/kvm/i8254.c
@@
-32,6
+32,7
@@
#define pr_fmt(fmt) "pit: " fmt
#include <linux/kvm_host.h>
+#include <linux/slab.h>
#include "irq.h"
#include "i8254.h"