Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0c79358b authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] m68k: Moved initialisation of conswitchp from subarches to global arch setup 



Signed-off-by: default avatarKars de Jong <jongk@linux-m68k.org>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 35efbcab

arch/m68k/amiga/config.c

+0 −3
Original line number Diff line number Diff line
@@ -431,9 +431,6 @@ void __init config_amiga(void) 
  mach_floppy_setup    = amiga_floppy_setup;

#endif

  mach_reset           = amiga_reset;

#ifdef CONFIG_DUMMY_CONSOLE

  conswitchp           = &dummy_con;

#endif

#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)

  mach_beep            = amiga_mksound;

#endif

arch/m68k/apollo/config.c

+0 −3
Original line number Diff line number Diff line
@@ -176,9 +176,6 @@ void config_apollo(void) { 
	mach_set_clock_mmss  = dn_dummy_set_clock_mmss; /* */

	mach_process_int     = dn_process_int;

	mach_reset	     = dn_dummy_reset;  /* */

#ifdef CONFIG_DUMMY_CONSOLE

        conswitchp           = &dummy_con;

#endif

#ifdef CONFIG_HEARTBEAT

	mach_heartbeat = dn_heartbeat;

#endif

arch/m68k/atari/config.c

+0 −3
Original line number Diff line number Diff line
@@ -246,9 +246,6 @@ void __init config_atari(void) 
    mach_reset           = atari_reset;

#ifdef CONFIG_ATARI_FLOPPY

    mach_floppy_setup	 = atari_floppy_setup;

#endif

#ifdef CONFIG_DUMMY_CONSOLE

    conswitchp	         = &dummy_con;

#endif

    mach_max_dma_address = 0xffffff;

#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)

arch/m68k/hp300/config.c

+0 −3
Original line number Diff line number Diff line
@@ -260,9 +260,6 @@ void __init config_hp300(void) 
	mach_reset           = hp300_reset;

#ifdef CONFIG_HEARTBEAT

	mach_heartbeat       = hp300_pulse;

#endif

#ifdef CONFIG_DUMMY_CONSOLE

	conswitchp	     = &dummy_con;

#endif

	mach_max_dma_address = 0xffffffff;

arch/m68k/kernel/setup.c

+4 −0
Original line number Diff line number Diff line
@@ -282,6 +282,10 @@ void __init setup_arch(char **cmdline_p) 
	    }

	}



#ifdef CONFIG_DUMMY_CONSOLE

	conswitchp = &dummy_con;

#endif



	switch (m68k_machtype) {

#ifdef CONFIG_AMIGA

	    case MACH_AMIGA: