Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2d93486c6c110cf81db720359b4ec20de9c91450

Authored by Vincent Sanders
Committed by Russell King
1 parent d8ac10639b
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[ARM] 2907/1: GCC 4 serial driver compile fixes 

Patch from Vincent Sanders

When building the ARM platforms several serial drivers fail to compile
with GCC 4.01 due to extern/static ambiguity.

Signed-off-by: Vincent Sanders <vince@arm.linux.org.uk>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Showing 7 changed files with 8 additions and 8 deletions Side-by-side Diff

drivers/serial/21285.c
Diff comments   View file @ 2d93486
... ... @@ -463,7 +463,7 @@
463 463 return uart_set_options(port, co, baud, parity, bits, flow);
464 464 }
465 465  
466   -extern struct uart_driver serial21285_reg;
  466 +static struct uart_driver serial21285_reg;
467 467  
468 468 static struct console serial21285_console =
469 469 {
drivers/serial/amba-pl010.c
Diff comments   View file @ 2d93486
... ... @@ -689,7 +689,7 @@
689 689 return uart_set_options(port, co, baud, parity, bits, flow);
690 690 }
691 691  
692   -extern struct uart_driver amba_reg;
  692 +static struct uart_driver amba_reg;
693 693 static struct console amba_console = {
694 694 .name = "ttyAM",
695 695 .write = pl010_console_write,
drivers/serial/amba-pl011.c
Diff comments   View file @ 2d93486
... ... @@ -701,7 +701,7 @@
701 701 return uart_set_options(&uap->port, co, baud, parity, bits, flow);
702 702 }
703 703  
704   -extern struct uart_driver amba_reg;
  704 +static struct uart_driver amba_reg;
705 705 static struct console amba_console = {
706 706 .name = "ttyAMA",
707 707 .write = pl011_console_write,
drivers/serial/clps711x.c
Diff comments   View file @ 2d93486
... ... @@ -525,7 +525,7 @@
525 525 return uart_set_options(port, co, baud, parity, bits, flow);
526 526 }
527 527  
528   -extern struct uart_driver clps711x_reg;
  528 +static struct uart_driver clps711x_reg;
529 529 static struct console clps711x_console = {
530 530 .name = "ttyCL",
531 531 .write = clps711xuart_console_write,
drivers/serial/pxa.c
Diff comments   View file @ 2d93486
... ... @@ -589,8 +589,8 @@
589 589  
590 590 #ifdef CONFIG_SERIAL_PXA_CONSOLE
591 591  
592   -extern struct uart_pxa_port serial_pxa_ports[];
593   -extern struct uart_driver serial_pxa_reg;
  592 +static struct uart_pxa_port serial_pxa_ports[];
  593 +static struct uart_driver serial_pxa_reg;
594 594  
595 595 #define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)
596 596  
drivers/serial/sa1100.c
Diff comments   View file @ 2d93486
... ... @@ -799,7 +799,7 @@
799 799 return uart_set_options(&sport->port, co, baud, parity, bits, flow);
800 800 }
801 801  
802   -extern struct uart_driver sa1100_reg;
  802 +static struct uart_driver sa1100_reg;
803 803 static struct console sa1100_console = {
804 804 .name = "ttySA",
805 805 .write = sa1100_console_write,
drivers/serial/serial_lh7a40x.c
Diff comments   View file @ 2d93486
... ... @@ -632,7 +632,7 @@
632 632 return uart_set_options (port, co, baud, parity, bits, flow);
633 633 }
634 634  
635   -extern struct uart_driver lh7a40x_reg;
  635 +static struct uart_driver lh7a40x_reg;
636 636 static struct console lh7a40x_console = {
637 637 .name = "ttyAM",
638 638 .write = lh7a40xuart_console_write,