Merge commit 'v2.6.35' into kbuild/kbuild

Conflicts:
	arch/powerpc/Makefile

1 files changed, 2 insertions, 5 deletions

diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index ecdc19a299b2..2e3737b92ffc 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -7,6 +7,7 @@ config M68K
         default y
         select HAVE_AOUT
         select HAVE_IDE
+        select GENERIC_ATOMIC64
 
 config MMU
         bool
@@ -536,10 +537,6 @@ config GVPIOEXT_PLIP
           Say Y to enable doing IP over the parallel port on your GVP
           IO-Extender card, N otherwise.
 
-config MAC_SCC
-        tristate "Macintosh serial support"
-        depends on MAC
-
 config MAC_HID
         bool
         depends on INPUT_ADBHID
@@ -595,7 +592,7 @@ config DN_SERIAL
 
 config SERIAL_CONSOLE
         bool "Support for serial port console"
-        depends on (AMIGA || ATARI || MAC || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || MAC_SCC=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
+        depends on (AMIGA || ATARI || SUN3 || SUN3X || VME || APOLLO) && (ATARI_MFPSER=y || ATARI_MIDI=y || AMIGA_BUILTIN_SERIAL=y || GVPIOEXT=y || MULTIFACE_III_TTY=y || SERIAL=y || MVME147_SCC || SERIAL167 || MVME162_SCC || BVME6000_SCC || DN_SERIAL)
         ---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