Merge branch 'h8300' into h8300_clk

Conflicts:
	arch/h8300/kernel/setup.c

diff --cc arch/h8300/kernel/setup.c
index 35164f0,afc8796..979b207
--- 1/arch/h8300/kernel/setup.c
--- 2/arch/h8300/kernel/setup.c
+++ b/arch/h8300/kernel/setup.c
@@@ -55,9 -55,42 +55,9 @@@ unsigned long memory_end
  char __initdata command_line[COMMAND_LINE_SIZE];
  
  extern int _stext, _etext, _sdata, _edata, _sbss, _ebss, _end;
- extern int _ramstart, _ramend;
+ extern unsigned long _ramstart, _ramend;
  extern char _target_name[];
 -extern char command_start[];
 -extern void h8300_gpio_init(void);
 -
 -#if (defined(CONFIG_H8300H_SIM) || defined(CONFIG_H8S_SIM)) \
 -    && defined(CONFIG_GDB_MAGICPRINT)
 -/* printk with gdb service */
 -static void gdb_console_output(struct console *c, const char *msg, unsigned len)
 -{
 -      for (; len > 0; len--) {
 -              asm("mov.w %0,r2\n\t"
 -                    "jsr @0xc4"::"r"(*msg++):"er2");
 -      }
 -}
 -
 -/*
 - *    Setup initial baud/bits/parity. We do two things here:
 - *    - construct a cflag setting for the first rs_open()
 - *    - initialize the serial port
 - *    Return non-zero if we didn't find a serial port.
 - */
 -static int __init gdb_console_setup(struct console *co, char *options)
 -{
 -      return 0;
 -}
 -
 -static const struct console gdb_console = {
 -      .name           = "gdb_con",
 -      .write          = gdb_console_output,
 -      .device         = NULL,
 -      .setup          = gdb_console_setup,
 -      .flags          = CON_PRINTBUFFER,
 -      .index          = -1,
 -};
 -#endif
 +void h8300_early_devices_register(void);
  
  void __init setup_arch(char **cmdline_p)
  {