git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/cpufeature' into irq/numa
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
boot
/
main.c
diff --git
a/arch/alpha/boot/main.c
b/arch/alpha/boot/main.c
index 90ed55b662a85e32d91f1d8fb8dc5c0f9896232f..89f3be071ae5df5f947c7d7ee9fb888e93fa2912 100644
(file)
--- a/
arch/alpha/boot/main.c
+++ b/
arch/alpha/boot/main.c
@@
-132,7
+132,7
@@
static inline long load(long dev, unsigned long addr, unsigned long count)
if (result)
srm_printk("Boot file specification (%s) not implemented\n",
bootfile);
- return callback_read(dev, count, addr, boot_size/512 + 1);
+ return callback_read(dev, count,
(void *)
addr, boot_size/512 + 1);
}
/*