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 tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kvm
/
i8254.h
diff --git
a/arch/x86/kvm/i8254.h
b/arch/x86/kvm/i8254.h
index 394d9527da7ee904dbd262626c3fd8575de58706..a768212ba821c1d27bbff57f85867dbbd092a951 100644
(file)
--- a/
arch/x86/kvm/i8254.h
+++ b/
arch/x86/kvm/i8254.h
@@
-29,7
+29,6
@@
struct kvm_kpit_state {
bool is_periodic;
s64 period; /* unit: ns */
struct hrtimer timer;
- u32 speaker_data_on;
struct mutex lock;
atomic_t reinject;