From 7f825218dc3ca8c4f43ac288d800832d96d455f2 Mon Sep 17 00:00:00 2001 From: York Sun Date: Wed, 16 Nov 2016 11:13:06 -0800 Subject: powerpc: mpc8540: Remove macro CONFIG_MPC8540 Replace CONFIG_MPC8540 with ARCH_MPC8540 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- drivers/input/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/input/keyboard.c') diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index 48255bd87b..522b02fa0a 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -20,7 +20,7 @@ static struct input_config config; static int kbd_read_keys(struct input_config *config) { -#if defined(CONFIG_MPC5xxx) || defined(CONFIG_MPC8540) || \ +#if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \ defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555) /* no ISR is used, so received chars must be polled */ ps2ser_check(); -- cgit From 3aff30825eba88ab57f6fc2182ceef288c8aaafc Mon Sep 17 00:00:00 2001 From: York Sun Date: Wed, 16 Nov 2016 11:18:31 -0800 Subject: powerpc: mpc8541: Remove macro CONFIG_MPC8541 Replace CONFIG_MPC8541 with ARCH_MPC8541 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- drivers/input/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/input/keyboard.c') diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index 522b02fa0a..f53a07afcc 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -21,7 +21,7 @@ static struct input_config config; static int kbd_read_keys(struct input_config *config) { #if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \ - defined(CONFIG_MPC8541) || defined(CONFIG_MPC8555) + defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) /* no ISR is used, so received chars must be polled */ ps2ser_check(); #endif -- cgit From 3c3d8ab58d40d39830de7aed3f4b7110067d7d2d Mon Sep 17 00:00:00 2001 From: York Sun Date: Wed, 16 Nov 2016 11:23:23 -0800 Subject: powerpc: MPC8555: Remove macro CONFIG_MPC8555 Replace CONFIG_MPC8555 with ARCH_MPC8555 in Kconfig and clean up existing macros. Signed-off-by: York Sun --- drivers/input/keyboard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/input/keyboard.c') diff --git a/drivers/input/keyboard.c b/drivers/input/keyboard.c index f53a07afcc..7af5868dea 100644 --- a/drivers/input/keyboard.c +++ b/drivers/input/keyboard.c @@ -21,7 +21,7 @@ static struct input_config config; static int kbd_read_keys(struct input_config *config) { #if defined(CONFIG_MPC5xxx) || defined(CONFIG_ARCH_MPC8540) || \ - defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_MPC8555) + defined(CONFIG_ARCH_MPC8541) || defined(CONFIG_ARCH_MPC8555) /* no ISR is used, so received chars must be polled */ ps2ser_check(); #endif -- cgit