projects
/
linux-2.6-block.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
[linux-2.6-block.git]
/
include
/
clocksource
/
arm_arch_timer.h
diff --git
a/include/clocksource/arm_arch_timer.h
b/include/clocksource/arm_arch_timer.h
index 349e5957c9498db170d85c434d9fc037d5d2acba..702967d996bb38edd9eaa3c9f7d3300f38f3b08c 100644
(file)
--- a/
include/clocksource/arm_arch_timer.h
+++ b/
include/clocksource/arm_arch_timer.h
@@
-74,6
+74,7
@@
enum arch_timer_spi_nr {
struct arch_timer_kvm_info {
struct timecounter timecounter;
int virtual_irq;
+ int physical_irq;
};
struct arch_timer_mem_frame {