diff options
author | Finn Thain <fthain@telegraphics.com.au> | 2009-11-17 04:04:44 -0500 |
---|---|---|
committer | Geert Uytterhoeven <geert@linux-m68k.org> | 2010-02-27 12:31:02 -0500 |
commit | ec9cbe09899e36b5f216c3232215520dcf0320ab (patch) | |
tree | 7960e72bdad982d7dd18cab1e49ae3ca42d1a5a0 /arch/m68k | |
parent | 1f7b5fff505232521a7a770a639b63cd17636549 (diff) |
pmac-zilog: add platform driver
Add platform driver support to the pmac-zilog driver, for m68k macs.
Place the powermac-specific code inside #ifdef CONFIG_PPC_PMAC.
Signed-off-by: Finn Thain <fthain@telegraphics.com.au>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'arch/m68k')
-rw-r--r-- | arch/m68k/configs/mac_defconfig | 5 | ||||
-rw-r--r-- | arch/m68k/configs/multi_defconfig | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig index 9991b64fea57..3cbbf880a9e3 100644 --- a/arch/m68k/configs/mac_defconfig +++ b/arch/m68k/configs/mac_defconfig | |||
@@ -701,6 +701,11 @@ CONFIG_VT_HW_CONSOLE_BINDING=y | |||
701 | # | 701 | # |
702 | # Non-8250 serial port support | 702 | # Non-8250 serial port support |
703 | # | 703 | # |
704 | CONFIG_SERIAL_CORE=y | ||
705 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
706 | CONFIG_SERIAL_PMACZILOG=y | ||
707 | CONFIG_SERIAL_PMACZILOG_TTYS=y | ||
708 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y | ||
704 | CONFIG_UNIX98_PTYS=y | 709 | CONFIG_UNIX98_PTYS=y |
705 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 710 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
706 | CONFIG_LEGACY_PTYS=y | 711 | CONFIG_LEGACY_PTYS=y |
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig index 69c43e2d8b45..8a2371933beb 100644 --- a/arch/m68k/configs/multi_defconfig +++ b/arch/m68k/configs/multi_defconfig | |||
@@ -822,6 +822,11 @@ CONFIG_A2232=y | |||
822 | # | 822 | # |
823 | # Non-8250 serial port support | 823 | # Non-8250 serial port support |
824 | # | 824 | # |
825 | CONFIG_SERIAL_CORE=y | ||
826 | CONFIG_SERIAL_CORE_CONSOLE=y | ||
827 | CONFIG_SERIAL_PMACZILOG=y | ||
828 | CONFIG_SERIAL_PMACZILOG_TTYS=y | ||
829 | CONFIG_SERIAL_PMACZILOG_CONSOLE=y | ||
825 | CONFIG_UNIX98_PTYS=y | 830 | CONFIG_UNIX98_PTYS=y |
826 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | 831 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set |
827 | CONFIG_LEGACY_PTYS=y | 832 | CONFIG_LEGACY_PTYS=y |