diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-07-25 10:40:14 -0400 |
| commit | ff877ea80efa2015b6263766f78ee42c2a1b32f9 (patch) | |
| tree | 85205005c611ab774702148558321c6fb92f1ccd /include/xen/interface/callback.h | |
| parent | 30821fee4f0cb3e6d241d9f7ddc37742212e3eb7 (diff) | |
| parent | d37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7 (diff) | |
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
Diffstat (limited to 'include/xen/interface/callback.h')
| -rw-r--r-- | include/xen/interface/callback.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/xen/interface/callback.h b/include/xen/interface/callback.h index 4aadcba31af9..2ae3cd243264 100644 --- a/include/xen/interface/callback.h +++ b/include/xen/interface/callback.h | |||
| @@ -82,9 +82,9 @@ | |||
| 82 | */ | 82 | */ |
| 83 | #define CALLBACKOP_register 0 | 83 | #define CALLBACKOP_register 0 |
| 84 | struct callback_register { | 84 | struct callback_register { |
| 85 | uint16_t type; | 85 | uint16_t type; |
| 86 | uint16_t flags; | 86 | uint16_t flags; |
| 87 | struct xen_callback address; | 87 | xen_callback_t address; |
| 88 | }; | 88 | }; |
| 89 | 89 | ||
| 90 | /* | 90 | /* |