Current (FEC from 2.6.31 port, no CAN, no I2C, no PCI)

[mcf548x/linux.git] / arch / m68k / kernel / setup.c

diff --git a/arch/m68k/kernel/setup.c b/arch/m68k/kernel/setup.c
index 1e29fac369407cd0e4f07e28ba114a8ce62a6678..9e1b0e92dcce45a02169202941d600288bcac939 100644 (file)
--- a/arch/m68k/kernel/setup.c
+++ b/arch/m68k/kernel/setup.c
@@ -173,8 +173,11 @@ static void __init m68k_parse_bootinfo(const struct bi_record *record)
                        break;
 
                case BI_RAMDISK:
+//if U-boot then ignore
+#ifndef CONFIG_UBOOT
                        m68k_ramdisk.addr = data[0];
                        m68k_ramdisk.size = data[1];
+#endif
                        break;
 
                case BI_COMMAND_LINE: