[patch] Solves syslib/m8260_setup.c ROOT_DEV problem

[patch] Solves syslib/m8260_setup.c ROOT_DEV problem

[alebas]

Hi,

This patch applies against head versions of both linuxppc-2.5 in ppc.bkbits.net
and linux-2.5 in linux.bkbits.net

I don't now if this has been corrected in some other tree.

The patch corrects the following error during compilation

  LD      arch/ppc/lib/built-in.o
  CC      arch/ppc/syslib/m8260_setup.o
arch/ppc/syslib/m8260_setup.c: In function `m8260_setup_arch':
arch/ppc/syslib/m8260_setup.c:56: `ROOT_DEV' undeclared (first use in this
function)
arch/ppc/syslib/m8260_setup.c:56: (Each undeclared identifier is reported only
once
arch/ppc/syslib/m8260_setup.c:56: for each function it appears in.)
arch/ppc/syslib/m8260_setup.c:56: `Root_RAM0' undeclared (first use in this
function)
arch/ppc/syslib/m8260_setup.c: In function `m8260_show_cpuinfo':
arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
int arg (arg 5)
arch/ppc/syslib/m8260_setup.c:149: warning: int format, long unsigned int arg
(arg 6)
arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
int arg (arg 7)
arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
int arg (arg 8)
arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
int arg (arg 9)
make[1]: *** [arch/ppc/syslib/m8260_setup.o] Error 1
make: *** [arch/ppc/syslib] Error 2

Here, arch was ppc and configuration was ads8272_defconfig.

Best regards,

Alex


--- arch/ppc/syslib/m8260_setup.c.orig  2004-11-12 11:55:32.000000000 +0100
+++ arch/ppc/syslib/m8260_setup.c       2004-11-12 13:55:00.000000000 +0100
@@ -16,6 +16,9 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/initrd.h>
+#ifdef CONFIG_BLK_DEV_INITRD
+#include <linux/root_dev.h>
+#endif
 #include <linux/seq_file.h>
 #include <linux/irq.h>

Re: [patch] Solves syslib/m8260_setup.c ROOT_DEV problem

[Tom Rini]

On Fri, Nov 12, 2004 at 02:09:13PM +0100, alebas@televes.com wrote:

> Hi,
> 
> This patch applies against head versions of both linuxppc-2.5 in ppc.bkbits.net
> and linux-2.5 in linux.bkbits.net
> 
> I don't now if this has been corrected in some other tree.
> 
> The patch corrects the following error during compilation
> 
>   LD      arch/ppc/lib/built-in.o
>   CC      arch/ppc/syslib/m8260_setup.o
> arch/ppc/syslib/m8260_setup.c: In function `m8260_setup_arch':
> arch/ppc/syslib/m8260_setup.c:56: `ROOT_DEV' undeclared (first use in this
> function)
> arch/ppc/syslib/m8260_setup.c:56: (Each undeclared identifier is reported only
> once
> arch/ppc/syslib/m8260_setup.c:56: for each function it appears in.)
> arch/ppc/syslib/m8260_setup.c:56: `Root_RAM0' undeclared (first use in this
> function)
> arch/ppc/syslib/m8260_setup.c: In function `m8260_show_cpuinfo':
> arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
> int arg (arg 5)
> arch/ppc/syslib/m8260_setup.c:149: warning: int format, long unsigned int arg
> (arg 6)
> arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
> int arg (arg 7)
> arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
> int arg (arg 8)
> arch/ppc/syslib/m8260_setup.c:149: warning: unsigned int format, long unsigned
> int arg (arg 9)
> make[1]: *** [arch/ppc/syslib/m8260_setup.o] Error 1
> make: *** [arch/ppc/syslib] Error 2
> 
> Here, arch was ppc and configuration was ads8272_defconfig.

I'll push something similar, thanks.

-- 
Tom Rini
http://gate.crashing.org/~trini/