Re: [PATCH] c6x: kernel: setup: Include "linux/console.h" if both VT and DUMMY_CONSOLE enabled

[Mark Salter]

On Sun, 2015-03-01 at 15:59 +0800, Chen Gang wrote:
> Or c6x will cause building break for allmodconfig, the related error:
> 
>     CC      arch/c6x/kernel/setup.o
>   arch/c6x/kernel/setup.c: In function 'setup_arch':
>   arch/c6x/kernel/setup.c:433:2: error: 'conswitchp' undeclared (first use in this function)
>     conswitchp = &dummy_con;
>     ^
>   arch/c6x/kernel/setup.c:433:2: note: each undeclared identifier is reported only once for each function it appears in
>   arch/c6x/kernel/setup.c:433:16: error: 'dummy_con' undeclared (first use in this function)
>     conswitchp = &dummy_con;
>                   ^
> 
> Signed-off-by: Chen Gang <gang.chen.5i5j@xxxxxxxxx>
> ---
>  arch/c6x/kernel/setup.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
> index 7571288..a5f6e0e 100644
> --- a/arch/c6x/kernel/setup.c
> +++ b/arch/c6x/kernel/setup.c
> @@ -26,7 +26,9 @@
>  #include <linux/cpu.h>
>  #include <linux/fs.h>
>  #include <linux/of.h>
> -
> +#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
> +#include <linux/console.h>
> +#endif

No need for the #ifdefs around the include.
I removed them and pulled this into the c6x tree.

Thanks!

>  
>  #include <asm/sections.h>
>  #include <asm/div64.h>


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/