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

Commit 3127f23f 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 

Pull m68k updates from Geert Uytterhoeven.

Fix up trivial conflict (m68k switched to generic version of
uapi/asm/socket.h, net tree updated the old one) as per Geert.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/sun3: Fix instruction faults
  m68k/sun3: Get interrupts working again
  m68k: move to a single instance of free_initmem()
  m68k: merge MMU and non-MMU versions of mm/init.c
  m68k: switch to using the asm-generic termios.h
  m68k: switch to using the asm-generic termbits.h
  m68k: switch to using the asm-generic sockios.h
  m68k: switch to using the asm-generic socket.h
  m68k: switch to using the asm-generic shmbuf.h
  m68k: switch to using the asm-generic sembuf.h
  m68k: switch to using the asm-generic msgbuf.h
  m68k: switch to using the asm-generic auxvec.h
  m68k: switch to using the asm-generic shmparam.h
  m68k: switch to using the asm-generic spinlock.h
  m68k: switch to using the asm-generic hw_irq.h
  arch/m68k: remove CONFIG_EXPERIMENTAL
parents 8863e092 5fec45a2

arch/m68k/Kconfig.bus

+2 −2
Original line number Diff line number Diff line
@@ -28,8 +28,8 @@ config ZORRO 
	  Linux use these.



config AMIGA_PCMCIA

	bool "Amiga 1200/600 PCMCIA support (EXPERIMENTAL)"

	depends on AMIGA && EXPERIMENTAL

	bool "Amiga 1200/600 PCMCIA support"

	depends on AMIGA

	help

	  Include support in the kernel for pcmcia on Amiga 1200 and Amiga

	  600. If you intend to use pcmcia cards say Y; otherwise say N.

arch/m68k/Kconfig.cpu

+1 −2
Original line number Diff line number Diff line
@@ -274,9 +274,8 @@ endif # COLDFIRE 
comment "Processor Specific Options"



config M68KFPU_EMU

	bool "Math emulation support (EXPERIMENTAL)"

	bool "Math emulation support"

	depends on MMU

	depends on EXPERIMENTAL

	help

	  At some point in the future, this will cause floating-point math

	  instructions to be emulated by the kernel on machines that lack a

arch/m68k/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ config NO_KERNEL_MSG 


config BDM_DISABLE

	bool "Disable BDM signals"

	depends on (EXPERIMENTAL && COLDFIRE)

	depends on COLDFIRE

	help

	  Disable the ColdFire CPU's BDM signals.

arch/m68k/Kconfig.devices

+3 −3
Original line number Diff line number Diff line
@@ -60,8 +60,8 @@ endmenu 
menu "Character devices"



config ATARI_DSP56K

	tristate "Atari DSP56k support (EXPERIMENTAL)"

	depends on ATARI && EXPERIMENTAL

	tristate "Atari DSP56k support"

	depends on ATARI

	help

	  If you want to be able to use the DSP56001 in Falcons, say Y. This

	  driver is still experimental, and if you don't know what it is, or
@@ -87,7 +87,7 @@ config HPDCA 


config HPAPCI

	tristate "HP APCI serial support"

	depends on HP300 && SERIAL_8250 && EXPERIMENTAL

	depends on HP300 && SERIAL_8250

	help

	  If you want to use the internal "APCI" serial ports on an HP400

	  machine, say Y here.

arch/m68k/include/asm/Kbuild

+4 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ generic-y += emergency-restart.h 
generic-y += errno.h

generic-y += exec.h

generic-y += futex.h

generic-y += hw_irq.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h
@@ -21,8 +22,11 @@ generic-y += percpu.h 
generic-y += resource.h

generic-y += scatterlist.h

generic-y += sections.h

generic-y += shmparam.h

generic-y += siginfo.h

generic-y += spinlock.h

generic-y += statfs.h

generic-y += termios.h

generic-y += topology.h

generic-y += trace_clock.h

generic-y += types.h