Commit 49708c9e authored by Christophe Leroy's avatar Christophe Leroy Committed by Greg Kroah-Hartman

tty: cpm_uart: replace CONFIG_8xx by CONFIG_CPM1

Two config options exist to define powerpc MPC8xx:
* CONFIG_PPC_8xx
* CONFIG_8xx
In addition, CONFIG_PPC_8xx also defines CONFIG_CPM1 as
communication co-processor

arch/powerpc/platforms/Kconfig.cputype has contained the following
comment about CONFIG_8xx item for some years:
"# this is temp to handle compat with arch=ppc"

It looks like not many places still have that old CONFIG_8xx used,
so it is likely to be a good time to get rid of it completely ?
Signed-off-by: default avatarChristophe Leroy <christophe.leroy@c-s.fr>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a666b54a
...@@ -868,7 +868,7 @@ config SERIAL_PMACZILOG_CONSOLE ...@@ -868,7 +868,7 @@ config SERIAL_PMACZILOG_CONSOLE
config SERIAL_CPM config SERIAL_CPM
tristate "CPM SCC/SMC serial port support" tristate "CPM SCC/SMC serial port support"
depends on CPM2 || 8xx depends on CPM2 || CPM1
select SERIAL_CORE select SERIAL_CORE
help help
This driver supports the SCC and SMC serial ports on Motorola This driver supports the SCC and SMC serial ports on Motorola
......
...@@ -6,6 +6,6 @@ obj-$(CONFIG_SERIAL_CPM) += cpm_uart.o ...@@ -6,6 +6,6 @@ obj-$(CONFIG_SERIAL_CPM) += cpm_uart.o
# Select the correct platform objects. # Select the correct platform objects.
cpm_uart-objs-$(CONFIG_CPM2) += cpm_uart_cpm2.o cpm_uart-objs-$(CONFIG_CPM2) += cpm_uart_cpm2.o
cpm_uart-objs-$(CONFIG_8xx) += cpm_uart_cpm1.o cpm_uart-objs-$(CONFIG_CPM1) += cpm_uart_cpm1.o
cpm_uart-objs := cpm_uart_core.o $(cpm_uart-objs-y) cpm_uart-objs := cpm_uart_core.o $(cpm_uart-objs-y)
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#if defined(CONFIG_CPM2) #if defined(CONFIG_CPM2)
#include "cpm_uart_cpm2.h" #include "cpm_uart_cpm2.h"
#elif defined(CONFIG_8xx) #elif defined(CONFIG_CPM1)
#include "cpm_uart_cpm1.h" #include "cpm_uart_cpm1.h"
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment