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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k/block: amiflop - Remove superfluous amiga_chip_alloc() cast
  m68k/atari: ARAnyM - Add support for network access
  m68k/atari: ARAnyM - Add support for console access
  m68k/atari: ARAnyM - Add support for block access
  m68k/atari: Initial ARAnyM support
  m68k: Kconfig - Remove unneeded "default n"
  m68k: Makefiles - Change to new flags variables
  m68k/amiga: Reclaim Chip RAM for PPC exception handlers
  m68k: Allow all kernel traps to be handled via exception fixups
  m68k: Use base_trap_init() to initialize vectors
  m68k: Add helper function handle_kernel_fault()

diff --combined arch/m68k/Kconfig
index a85e251c411f4ac3bd43d68867dc56ec2e30592a,80df6ee7cac891cea5fe5e41bf02f2b27ce1f326..525174d4167953cd7b14a770f2fc6ba0fbd3775a
--- 1/arch/m68k/Kconfig
--- 2/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@@ -18,11 -18,9 +18,9 @@@ config RWSEM_XCHGADD_ALGORITH
  
  config ARCH_HAS_ILOG2_U32
        bool
-       default n
  
  config ARCH_HAS_ILOG2_U64
        bool
-       default n
  
  config GENERIC_HWEIGHT
        bool
@@@ -242,6 -240,37 +240,37 @@@ config SUN
  
          If you don't want to compile a kernel exclusively for a Sun 3, say N.
  
+ config NATFEAT
+       bool "ARAnyM emulator support"
+       depends on ATARI
+       help
+         This option enables support for ARAnyM native features, such as
+         access to a disk image as /dev/hda.
+ 
+ config NFBLOCK
+       tristate "NatFeat block device support"
+       depends on BLOCK && NATFEAT
+       help
+         Say Y to include support for the ARAnyM NatFeat block device
+         which allows direct access to the hard drives without using
+         the hardware emulation.
+ 
+ config NFCON
+       tristate "NatFeat console driver"
+       depends on NATFEAT
+       help
+         Say Y to include support for the ARAnyM NatFeat console driver
+         which allows the console output to be redirected to the stderr
+         output of ARAnyM.
+ 
+ config NFETH
+       tristate "NatFeat Ethernet support"
+       depends on NET_ETHERNET && NATFEAT
+       help
+         Say Y to include support for the ARAnyM NatFeat network device
+         which will emulate a regular ethernet device while presenting an
+         ethertap device to the host system.
+ 
  comment "Processor type"
  
  config M68020
@@@ -554,6 -583,14 +583,6 @@@ config MVME147_SC
          This is the driver for the serial ports on the Motorola MVME147
          boards.  Everyone using one of these boards should say Y here.
  
 -config SERIAL167
 -      bool "CD2401 support for MVME166/7 serial ports"
 -      depends on MVME16x
 -      help
 -        This is the driver for the serial ports on the Motorola MVME166,
 -        167, and 172 boards.  Everyone using one of these boards should say
 -        Y here.
 -
  config MVME162_SCC
        bool "SCC support for MVME162 serial ports"
        depends on MVME16x && BROKEN