Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/tty/serial/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -868,7 +868,7 @@ config SERIAL_PMACZILOG_CONSOLE 


config SERIAL_CPM

	tristate "CPM SCC/SMC serial port support"

	depends on CPM2 || 8xx

	depends on CPM2 || CPM1

	select SERIAL_CORE

	help

	  This driver supports the SCC and SMC serial ports on Motorola

drivers/tty/serial/cpm_uart/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,6 +6,6 @@ obj-$(CONFIG_SERIAL_CPM) += cpm_uart.o 


# Select the correct platform objects.

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)

drivers/tty/serial/cpm_uart/cpm_uart.h

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 


#if defined(CONFIG_CPM2)

#include "cpm_uart_cpm2.h"

#elif defined(CONFIG_8xx)

#elif defined(CONFIG_CPM1)

#include "cpm_uart_cpm1.h"

#endif