summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 21:22:12 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-22 21:22:12 +0200
commitfb7a0e36532bc231bea8adfb1dddc3961eb38940 (patch)
tree82cb74383809668d6d92a5124fc60d11b35c8d6e /include
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6 (diff)
parentAuto merge with /home/aegl/GIT/linus (diff)
downloadlinux-fb7a0e36532bc231bea8adfb1dddc3961eb38940.tar.xz
linux-fb7a0e36532bc231bea8adfb1dddc3961eb38940.zip
Merge kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6.git
Do arch/ia64/defconfig by hand.
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 047e7222df7a..73781ec165b4 100644
--- a/include/linux/efi.h
+++ b/include/linux/efi.h
@@ -315,7 +315,7 @@ extern struct efi_memory_map memmap;
*/
static inline int efi_range_is_wc(unsigned long start, unsigned long len)
{
- int i;
+ unsigned long i;
for (i = 0; i < len; i += (1UL << EFI_PAGE_SHIFT)) {
unsigned long paddr = __pa(start + i);