aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k/configs
diff options
context:
space:
mode:
authorFinn Thain <fthain@telegraphics.com.au>2009-11-17 04:06:48 -0500
committerGeert Uytterhoeven <geert@linux-m68k.org>2010-02-27 12:31:09 -0500
commit80614e5ab1458ff3ccced4d6ba2fa386575c8d5c (patch)
treee34007d1ce2abb0c8c451764107973909798cac3 /arch/m68k/configs
parentec9cbe09899e36b5f216c3232215520dcf0320ab (diff)
mac68k: replace mac68k SCC code with platform device
Remove the old 68k Mac serial port code and a lot of related cruft. Add new SCC platform devices to mac 68k platform. Signed-off-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k/configs')
-rw-r--r--arch/m68k/configs/mac_defconfig2
-rw-r--r--arch/m68k/configs/multi_defconfig1
2 files changed, 0 insertions, 3 deletions
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 3cbbf880a9e3..c5f3232ff916 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -839,9 +839,7 @@ CONFIG_HIDRAW=y
839# 839#
840# Character devices 840# Character devices
841# 841#
842CONFIG_MAC_SCC=y
843CONFIG_MAC_HID=y 842CONFIG_MAC_HID=y
844CONFIG_SERIAL_CONSOLE=y
845 843
846# 844#
847# File systems 845# File systems
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 8a2371933beb..a8bfa3fa71cf 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -987,7 +987,6 @@ CONFIG_ATARI_MIDI=y
987CONFIG_ATARI_DSP56K=m 987CONFIG_ATARI_DSP56K=m
988CONFIG_AMIGA_BUILTIN_SERIAL=y 988CONFIG_AMIGA_BUILTIN_SERIAL=y
989CONFIG_MULTIFACE_III_TTY=m 989CONFIG_MULTIFACE_III_TTY=m
990CONFIG_MAC_SCC=y
991CONFIG_MAC_HID=y 990CONFIG_MAC_HID=y
992CONFIG_MVME147_SCC=y 991CONFIG_MVME147_SCC=y
993CONFIG_SERIAL167=y 992CONFIG_SERIAL167=y