diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:03:21 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-10-09 10:04:25 -0400 |
| commit | ffe315012510165ce82e4dd4767f0a5dba9edbf7 (patch) | |
| tree | f601cd980af9d0ced5ca9aedecef4fa0d2ca0e15 /include/xen/interface/callback.h | |
| parent | e2d3a35ee427aaba99b6c68a56609ce276c51270 (diff) | |
| parent | 4a8e43feeac7996b8de2d5b2823e316917493df4 (diff) | |
Merge tag 'disintegrate-mtd-20121009' of git://git.infradead.org/users/dhowells/linux-headers
UAPI Disintegration 2012-10-09
Conflicts:
MAINTAINERS
arch/arm/configs/bcmring_defconfig
arch/arm/mach-imx/clk-imx51-imx53.c
drivers/mtd/nand/Kconfig
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/nand_bcm_umi.h
drivers/mtd/nand/orion_nand.c
Diffstat (limited to 'include/xen/interface/callback.h')
| -rw-r--r-- | include/xen/interface/callback.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/xen/interface/callback.h b/include/xen/interface/callback.h index 2ae3cd24326..8c5fa0e2015 100644 --- a/include/xen/interface/callback.h +++ b/include/xen/interface/callback.h | |||
| @@ -27,7 +27,7 @@ | |||
| 27 | #ifndef __XEN_PUBLIC_CALLBACK_H__ | 27 | #ifndef __XEN_PUBLIC_CALLBACK_H__ |
| 28 | #define __XEN_PUBLIC_CALLBACK_H__ | 28 | #define __XEN_PUBLIC_CALLBACK_H__ |
| 29 | 29 | ||
| 30 | #include "xen.h" | 30 | #include <xen/interface/xen.h> |
| 31 | 31 | ||
| 32 | /* | 32 | /* |
| 33 | * Prototype for this hypercall is: | 33 | * Prototype for this hypercall is: |