kbuild: move utsrelease.h to include/generated

[net-next-2.6.git] / arch / alpha / boot / main.c

diff --git a/arch/alpha/boot/main.c b/arch/alpha/boot/main.c
index 90ed55b662a85e32d91f1d8fb8dc5c0f9896232f..644b7db55438f4f1d1b8136bd9f680bbcf4f75a8 100644 (file)
--- a/arch/alpha/boot/main.c
+++ b/arch/alpha/boot/main.c
@@ -7,7 +7,7 @@
  */
 #include <linux/kernel.h>
 #include <linux/string.h>
-#include <linux/utsrelease.h>
+#include <generated/utsrelease.h>
 #include <linux/mm.h>
 
 #include <asm/system.h>
@@ -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);
 }
 
 /*