diff options
| author | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2009-06-17 12:35:24 -0400 |
| commit | 27f70c3117194f98beb009dc48bb2aa267f505bf (patch) | |
| tree | 22afa3fb31376da9e37f09a78745afe3f16fde8a /include | |
| parent | d186b86ffcad713a1dd3d03e9d4ce2d59f61a1ed (diff) | |
| parent | e088a4ad7fa53c3dc3c29f930025f41ccf01953e (diff) | |
Pull for-2.6.31 into release
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/efi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h index bb66feb164bd..ce4581fbc08b 100644 --- a/include/linux/efi.h +++ b/include/linux/efi.h | |||
| @@ -101,7 +101,7 @@ typedef struct { | |||
| 101 | u64 attribute; | 101 | u64 attribute; |
| 102 | } efi_memory_desc_t; | 102 | } efi_memory_desc_t; |
| 103 | 103 | ||
| 104 | typedef int (*efi_freemem_callback_t) (unsigned long start, unsigned long end, void *arg); | 104 | typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg); |
| 105 | 105 | ||
| 106 | /* | 106 | /* |
| 107 | * Types and defines for Time Services | 107 | * Types and defines for Time Services |