summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-17 11:53:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-17 11:53:48 -0700
commit7cc47662197b3050a974a6c6aed52291bb38ded0 (patch)
treedd95d15aa97a3357d3789eba6848f0f888411bec /include
parent55a6fbf8fc57d7b60d5028663f534475c4965215 (diff)
parent27f70c3117194f98beb009dc48bb2aa267f505bf (diff)
downloadop-kernel-dev-7cc47662197b3050a974a6c6aed52291bb38ded0.zip
op-kernel-dev-7cc47662197b3050a974a6c6aed52291bb38ded0.tar.gz
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/efi.h b/include/linux/efi.h
index bb66feb..ce4581f 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -101,7 +101,7 @@ typedef struct {
u64 attribute;
} efi_memory_desc_t;
-typedef int (*efi_freemem_callback_t) (unsigned long start, unsigned long end, void *arg);
+typedef int (*efi_freemem_callback_t) (u64 start, u64 end, void *arg);
/*
* Types and defines for Time Services
OpenPOWER on IntegriCloud