Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=bdd71eec9b24fb6f7e83148f73c2312a42b2aed5
Commit:     bdd71eec9b24fb6f7e83148f73c2312a42b2aed5
Parent:     97a4649d6ffce4a5d7f5ce018d87a6cefcb4ad03
Author:     Olof Johansson <[EMAIL PROTECTED]>
AuthorDate: Sat Oct 20 13:39:26 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Thu Nov 8 14:15:29 2007 +1100

    [POWERPC] Fix build break in arch/ppc/syslib/m8260_setup.c
    
    Fix build break and warnings in current mainline git:
    
    arch/ppc/syslib/m8260_setup.c: In function 'm8260_setup_arch':
    arch/ppc/syslib/m8260_setup.c:63: error: implicit declaration of function 
'identify_ppc_sys_by_name_and_id'
    arch/ppc/syslib/m8260_setup.c:64: warning: passing argument 1 of 'in_be32' 
makes pointer from integer without a cast
    arch/ppc/syslib/m8260_setup.c: In function 'm8260_show_cpuinfo':
    arch/ppc/syslib/m8260_setup.c:158: warning: format '%08x' expects type 
'unsigned int', but argument 5 has type 'long unsigned int'
    arch/ppc/syslib/m8260_setup.c:158: warning: format '%d' expects type 'int', 
but argument 6 has type 'long unsigned int'
    arch/ppc/syslib/m8260_setup.c:158: warning: format '%u' expects type 
'unsigned int', but argument 7 has type 'long unsigned int'
    arch/ppc/syslib/m8260_setup.c:158: warning: format '%u' expects type 
'unsigned int', but argument 8 has type 'long unsigned int'
    arch/ppc/syslib/m8260_setup.c:158: warning: format '%u' expects type 
'unsigned int', but argument 9 has type 'long unsigned int'
    make[1]: *** [arch/ppc/syslib/m8260_setup.o] Error 1
    make[1]: *** Waiting for unfinished jobs....
    
    Signed-off-by: Olof Johansson <[EMAIL PROTECTED]>
    Signed-off-by: Paul Mackerras <[EMAIL PROTECTED]>
---
 arch/ppc/syslib/m8260_setup.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/arch/ppc/syslib/m8260_setup.c b/arch/ppc/syslib/m8260_setup.c
index 15f0d73..46588fa 100644
--- a/arch/ppc/syslib/m8260_setup.c
+++ b/arch/ppc/syslib/m8260_setup.c
@@ -25,6 +25,7 @@
 #include <asm/machdep.h>
 #include <asm/bootinfo.h>
 #include <asm/time.h>
+#include <asm/ppc_sys.h>
 
 #include "cpm2_pic.h"
 
@@ -61,7 +62,7 @@ m8260_setup_arch(void)
 #endif
 
        identify_ppc_sys_by_name_and_id(BOARD_CHIP_NAME,
-                               in_be32(CPM_MAP_ADDR + CPM_IMMR_OFFSET));
+                       in_be32((void *)CPM_MAP_ADDR + CPM_IMMR_OFFSET));
 
        m82xx_board_setup();
 }
@@ -147,12 +148,12 @@ m8260_show_cpuinfo(struct seq_file *m)
        seq_printf(m, "vendor\t\t: %s\n"
                   "machine\t\t: %s\n"
                   "\n"
-                  "mem size\t\t: 0x%08x\n"
-                  "console baud\t\t: %d\n"
+                  "mem size\t\t: 0x%08lx\n"
+                  "console baud\t\t: %ld\n"
                   "\n"
-                  "core clock\t: %u MHz\n"
-                  "CPM  clock\t: %u MHz\n"
-                  "bus  clock\t: %u MHz\n",
+                  "core clock\t: %lu MHz\n"
+                  "CPM  clock\t: %lu MHz\n"
+                  "bus  clock\t: %lu MHz\n",
                   CPUINFO_VENDOR, CPUINFO_MACHINE, bp->bi_memsize,
                   bp->bi_baudrate, bp->bi_intfreq / 1000000,
                   bp->bi_cpmfreq / 1000000, bp->bi_busfreq / 1000000);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to