[PATCH] avr32: atmel_default_console_device depends on CONFIG_SERIAL_ATMEL

[PATCH] avr32: atmel_default_console_device depends on CONFIG_SERIAL_ATMEL

[Geert Uytterhoeven]

allnoconfig:

arch/avr32/mach-at32ap/built-in.o: In function `at32_select_gpio':
(.init.text+0x548): undefined reference to `atmel_default_console_device'

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
---
 arch/avr32/mach-at32ap/at32ap700x.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index b323d8d..a2fe61b 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1060,7 +1060,9 @@ struct platform_device *__init at32_add_device_usart(unsigned int id)
 
 void __init at32_setup_serial_console(unsigned int usart_id)
 {
+#ifdef CONFIG_SERIAL_ATMEL
 	atmel_default_console_device = at32_usarts[usart_id];
+#endif
 }
 
 /* --------------------------------------------------------------------
-- 
1.7.0.4

Re: [PATCH] avr32: atmel_default_console_device depends on CONFIG_SERIAL_ATMEL

[Hans-Christian Egtvedt]

Around Tue 12 Feb 2013 15:27:35 +0100 or thereabout, Geert Uytterhoeven wrote:
> allnoconfig:
> 
> arch/avr32/mach-at32ap/built-in.o: In function `at32_select_gpio':
> (.init.text+0x548): undefined reference to `atmel_default_console_device'

Indeed, I guess building without serial support has never been done.

> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
>

Acked-by: Hans-Christian Egtvedt <egtvedt@samfundet.no>

> ---
>  arch/avr32/mach-at32ap/at32ap700x.c |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
> index b323d8d..a2fe61b 100644
> --- a/arch/avr32/mach-at32ap/at32ap700x.c
> +++ b/arch/avr32/mach-at32ap/at32ap700x.c
> @@ -1060,7 +1060,9 @@ struct platform_device *__init at32_add_device_usart(unsigned int id)
>  
>  void __init at32_setup_serial_console(unsigned int usart_id)
>  {
> +#ifdef CONFIG_SERIAL_ATMEL
>  	atmel_default_console_device = at32_usarts[usart_id];
> +#endif
>  }
>  
>  /* --------------------------------------------------------------------
-- 
mvh
Hans-Christian Egtvedt