Commit 356b9542 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: (21 commits)
  m68k/mac: Make CONFIG_HEARTBEAT unavailable on Mac
  m68k/serial: Remove references to obsolete serial config options
  m68k/net: Remove obsolete IRQ_FLG_* users
  m68k: Don't comment out syscalls used by glibc
  m68k/atari: Move declaration of atari_SCC_reset_done to header file
  m68k/serial: Remove references to obsolete CONFIG_SERIAL167
  m68k/hp300: Export hp300_ledstate
  m68k: Initconst section fixes
  m68k/mac: cleanup macro case
  mac_scsi: fix mac_scsi on some powerbooks
  m68k/mac: fix powerbook 150 adb_type
  m68k/mac: fix baboon irq disable and shutdown
  m68k/mac: oss irq fixes
  m68k/mac: fix nubus slot irq disable and shutdown
  m68k/mac: enable via_alt_mapping on performa 580
  m68k/mac: cleanup forward declarations
  m68k/mac: cleanup mac_irq_pending
  m68k/mac: cleanup mac_clear_irq
  m68k/mac: early console
  m68k/mvme16x: Add support for EARLY_PRINTK
  ...

Fix up trivial conflict in arch/m68k/Kconfig.debug due to new
EARLY_PRINTK config option addition clashing with movement of the
BOOTPARAM options.
parents 770e1b03 3bd9e50b

arch/m68k/Kconfig.debug

+11 −0
Original line number Diff line number Diff line
@@ -10,6 +10,17 @@ config BOOTPARAM_STRING 
	default 'console=ttyS0,19200'

	depends on BOOTPARAM



config EARLY_PRINTK

	bool "Early printk" if EMBEDDED

	depends on MVME16x || MAC

	default y

	help

          Write kernel log output directly to a serial port.



          This is useful for kernel debugging when your machine crashes very

          early before the console code is initialized.

          You should normally say N here, unless you want to debug such a crash.



if !MMU



config FULLDEBUG

arch/m68k/Kconfig.devices

+6 −40
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ config ARCH_MAY_HAVE_PC_FDC 
menu "Platform devices"



config HEARTBEAT

	bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || MAC ||Q40

	default y if !AMIGA && !APOLLO && !ATARI && !MAC && !Q40 && HP300

	bool "Use power LED as a heartbeat" if AMIGA || APOLLO || ATARI || Q40

	default y if !AMIGA && !APOLLO && !ATARI && !Q40 && HP300

	help

	  Use the power-on LED on your machine as a load meter.  The exact

	  behavior is platform-dependent, but normally the flash frequency is
@@ -59,27 +59,6 @@ endmenu 


menu "Character devices"



config ATARI_MFPSER

	tristate "Atari MFP serial support"

	depends on ATARI

	---help---

	  If you like to use the MFP serial ports ("Modem1", "Serial1") under

	  Linux, say Y. The driver equally supports all kinds of MFP serial

	  ports and automatically detects whether Serial1 is available.



	  To compile this driver as a module, choose M here.



	  Note for Falcon users: You also have an MFP port, it's just not

	  wired to the outside... But you could use the port under Linux.



config ATARI_MIDI

	tristate "Atari MIDI serial support"

	depends on ATARI

	help

	  If you want to use your Atari's MIDI port in Linux, say Y.



	  To compile this driver as a module, choose M here.



config ATARI_DSP56K

	tristate "Atari DSP56k support (EXPERIMENTAL)"

	depends on ATARI && EXPERIMENTAL
@@ -99,15 +78,6 @@ config AMIGA_BUILTIN_SERIAL 


	  To compile this driver as a module, choose M here.



config MULTIFACE_III_TTY

	tristate "Multiface Card III serial support"

	depends on AMIGA

	help

	  If you want to use a Multiface III card's serial port in Linux,

	  answer Y.



	  To compile this driver as a module, choose M here.



config HPDCA

	tristate "HP DCA serial support"

	depends on DIO && SERIAL_8250
@@ -122,13 +92,9 @@ config HPAPCI 
	  If you want to use the internal "APCI" serial ports on an HP400

	  machine, say Y here.



config DN_SERIAL

	bool "Support for DN serial port (dummy)"

	depends on APOLLO



config SERIAL_CONSOLE

	bool "Support for serial port console"

	depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || MULTIFACE_III_TTY=y || SERIAL=y || SERIAL167 || DN_SERIAL)

	depends on AMIGA_BUILTIN_SERIAL=y

	---help---

	  If you say Y here, it will be possible to use a serial port as the

	  system console (the system console is the device which receives all
@@ -140,10 +106,10 @@ config SERIAL_CONSOLE 
	  (/dev/tty0) will still be used as the system console by default, but

	  you can alter that using a kernel command line option such as

	  "console=ttyS1". (Try "man bootparam" or see the documentation of

	  your boot loader (lilo or loadlin) about how to pass options to the

	  kernel at boot time.)

	  your boot loader about how to pass options to the kernel at boot

	  time.)



	  If you don't have a VGA card installed and you say Y here, the

	  If you don't have a graphical console and you say Y here, the

	  kernel will automatically use the first serial line, /dev/ttyS0, as

	  system console.

arch/m68k/atari/ataints.c

+0 −2
Original line number Diff line number Diff line
@@ -82,8 +82,6 @@ __ALIGN_STR "\n\t" 


extern void atari_microwire_cmd(int cmd);



extern int atari_SCC_reset_done;



static unsigned int atari_irq_startup(struct irq_data *data)

{

	unsigned int irq = data->irq;

arch/m68k/atari/debug.c

+0 −1
Original line number Diff line number Diff line
@@ -202,7 +202,6 @@ static void __init atari_init_mfp_port(int cflag) 


static void __init atari_init_scc_port(int cflag)

{

	extern int atari_SCC_reset_done;

	static int clksrc_table[9] =

		/* reg 11: 0x50 = BRG, 0x00 = RTxC, 0x28 = TRxC */

		{ 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x50, 0x00, 0x00 };

arch/m68k/configs/amiga_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -255,7 +255,6 @@ CONFIG_HID=m 
CONFIG_HIDRAW=y

# CONFIG_USB_SUPPORT is not set

CONFIG_AMIGA_BUILTIN_SERIAL=y

CONFIG_MULTIFACE_III_TTY=m

CONFIG_SERIAL_CONSOLE=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE