diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 14:53:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-17 14:53:48 -0400 |
| commit | 7cc47662197b3050a974a6c6aed52291bb38ded0 (patch) | |
| tree | dd95d15aa97a3357d3789eba6848f0f888411bec /include | |
| parent | 55a6fbf8fc57d7b60d5028663f534475c4965215 (diff) | |
| parent | 27f70c3117194f98beb009dc48bb2aa267f505bf (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Convert ia64 to use int-ll64.h
[IA64] Fix build error in paravirt_patchlist.c
[IA64] ia64 does not need umount2() syscall
[IA64] hook up new rt_tgsigqueueinfo syscall
[IA64] msi_ia64.c dmar_msi_type should be static
[IA64] remove obsolete hw_interrupt_type
[IA64] remove obsolete irq_desc_t typedef
[IA64] remove obsolete no_irq_type
[IA64] unexport fpswa.h
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 |