diff options
author | Haavard Skinnemoen <hskinnemoen@atmel.com> | 2006-10-04 10:02:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-04 13:25:05 -0400 |
commit | 749c4e60334580ee0f1427eb90ad006fecbffd21 (patch) | |
tree | 902f94fc44a6ffa0e09914e603c36a37aef3e0c7 /arch/arm | |
parent | b6156b4e2e3b725ae3549882f59c82ab5b5048a5 (diff) |
[PATCH] at91_serial -> atmel_serial: Kconfig symbols
Rename the following Kconfig symbols:
* CONFIG_SERIAL_AT91 -> CONFIG_SERIAL_ATMEL
* CONFIG_SERIAL_AT91_CONSOLE -> CONFIG_SERIAL_ATMEL_CONSOLE
* CONFIG_SERIAL_AT91_TTYAT -> CONFIG_SERIAL_ATMEL_TTYAT
Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
Acked-by: Andrew Victor <andrew@sanpeople.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/configs/at91rm9200dk_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/at91rm9200ek_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/ateb9200_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/carmeva_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/csb337_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/csb637_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/kafa_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/configs/kb9202_defconfig | 4 | ||||
-rw-r--r-- | arch/arm/configs/onearm_defconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-at91rm9200/devices.c | 2 |
10 files changed, 26 insertions, 26 deletions
diff --git a/arch/arm/configs/at91rm9200dk_defconfig b/arch/arm/configs/at91rm9200dk_defconfig index 4f3d8d37741e..c82e4667f45e 100644 --- a/arch/arm/configs/at91rm9200dk_defconfig +++ b/arch/arm/configs/at91rm9200dk_defconfig | |||
@@ -553,9 +553,9 @@ CONFIG_HW_CONSOLE=y | |||
553 | # | 553 | # |
554 | # Non-8250 serial port support | 554 | # Non-8250 serial port support |
555 | # | 555 | # |
556 | CONFIG_SERIAL_AT91=y | 556 | CONFIG_SERIAL_ATMEL=y |
557 | CONFIG_SERIAL_AT91_CONSOLE=y | 557 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
558 | # CONFIG_SERIAL_AT91_TTYAT is not set | 558 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
559 | CONFIG_SERIAL_CORE=y | 559 | CONFIG_SERIAL_CORE=y |
560 | CONFIG_SERIAL_CORE_CONSOLE=y | 560 | CONFIG_SERIAL_CORE_CONSOLE=y |
561 | CONFIG_UNIX98_PTYS=y | 561 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/at91rm9200ek_defconfig b/arch/arm/configs/at91rm9200ek_defconfig index 08b5dc38876f..b983fc59aa42 100644 --- a/arch/arm/configs/at91rm9200ek_defconfig +++ b/arch/arm/configs/at91rm9200ek_defconfig | |||
@@ -534,9 +534,9 @@ CONFIG_HW_CONSOLE=y | |||
534 | # | 534 | # |
535 | # Non-8250 serial port support | 535 | # Non-8250 serial port support |
536 | # | 536 | # |
537 | CONFIG_SERIAL_AT91=y | 537 | CONFIG_SERIAL_ATMEL=y |
538 | CONFIG_SERIAL_AT91_CONSOLE=y | 538 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
539 | # CONFIG_SERIAL_AT91_TTYAT is not set | 539 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
540 | CONFIG_SERIAL_CORE=y | 540 | CONFIG_SERIAL_CORE=y |
541 | CONFIG_SERIAL_CORE_CONSOLE=y | 541 | CONFIG_SERIAL_CORE_CONSOLE=y |
542 | CONFIG_UNIX98_PTYS=y | 542 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/ateb9200_defconfig b/arch/arm/configs/ateb9200_defconfig index bee7813d040e..15e6b0bbbde8 100644 --- a/arch/arm/configs/ateb9200_defconfig +++ b/arch/arm/configs/ateb9200_defconfig | |||
@@ -656,9 +656,9 @@ CONFIG_HW_CONSOLE=y | |||
656 | # | 656 | # |
657 | # Non-8250 serial port support | 657 | # Non-8250 serial port support |
658 | # | 658 | # |
659 | CONFIG_SERIAL_AT91=y | 659 | CONFIG_SERIAL_ATMEL=y |
660 | CONFIG_SERIAL_AT91_CONSOLE=y | 660 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
661 | # CONFIG_SERIAL_AT91_TTYAT is not set | 661 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
662 | CONFIG_SERIAL_CORE=y | 662 | CONFIG_SERIAL_CORE=y |
663 | CONFIG_SERIAL_CORE_CONSOLE=y | 663 | CONFIG_SERIAL_CORE_CONSOLE=y |
664 | CONFIG_UNIX98_PTYS=y | 664 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/carmeva_defconfig b/arch/arm/configs/carmeva_defconfig index 8a075c8ecc63..d24ae8777c35 100644 --- a/arch/arm/configs/carmeva_defconfig +++ b/arch/arm/configs/carmeva_defconfig | |||
@@ -455,8 +455,8 @@ CONFIG_HW_CONSOLE=y | |||
455 | # | 455 | # |
456 | # Non-8250 serial port support | 456 | # Non-8250 serial port support |
457 | # | 457 | # |
458 | CONFIG_SERIAL_AT91=y | 458 | CONFIG_SERIAL_ATMEL=y |
459 | CONFIG_SERIAL_AT91_CONSOLE=y | 459 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
460 | CONFIG_SERIAL_CORE=y | 460 | CONFIG_SERIAL_CORE=y |
461 | CONFIG_SERIAL_CORE_CONSOLE=y | 461 | CONFIG_SERIAL_CORE_CONSOLE=y |
462 | CONFIG_UNIX98_PTYS=y | 462 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/csb337_defconfig b/arch/arm/configs/csb337_defconfig index cf3fa5cb26e4..a2d6fd398f16 100644 --- a/arch/arm/configs/csb337_defconfig +++ b/arch/arm/configs/csb337_defconfig | |||
@@ -591,9 +591,9 @@ CONFIG_HW_CONSOLE=y | |||
591 | # | 591 | # |
592 | # Non-8250 serial port support | 592 | # Non-8250 serial port support |
593 | # | 593 | # |
594 | CONFIG_SERIAL_AT91=y | 594 | CONFIG_SERIAL_ATMEL=y |
595 | CONFIG_SERIAL_AT91_CONSOLE=y | 595 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
596 | # CONFIG_SERIAL_AT91_TTYAT is not set | 596 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
597 | CONFIG_SERIAL_CORE=y | 597 | CONFIG_SERIAL_CORE=y |
598 | CONFIG_SERIAL_CORE_CONSOLE=y | 598 | CONFIG_SERIAL_CORE_CONSOLE=y |
599 | CONFIG_UNIX98_PTYS=y | 599 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/csb637_defconfig b/arch/arm/configs/csb637_defconfig index 640d70c1f066..2a1ac6c60abc 100644 --- a/arch/arm/configs/csb637_defconfig +++ b/arch/arm/configs/csb637_defconfig | |||
@@ -591,9 +591,9 @@ CONFIG_HW_CONSOLE=y | |||
591 | # | 591 | # |
592 | # Non-8250 serial port support | 592 | # Non-8250 serial port support |
593 | # | 593 | # |
594 | CONFIG_SERIAL_AT91=y | 594 | CONFIG_SERIAL_ATMEL=y |
595 | CONFIG_SERIAL_AT91_CONSOLE=y | 595 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
596 | # CONFIG_SERIAL_AT91_TTYAT is not set | 596 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
597 | CONFIG_SERIAL_CORE=y | 597 | CONFIG_SERIAL_CORE=y |
598 | CONFIG_SERIAL_CORE_CONSOLE=y | 598 | CONFIG_SERIAL_CORE_CONSOLE=y |
599 | CONFIG_UNIX98_PTYS=y | 599 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/kafa_defconfig b/arch/arm/configs/kafa_defconfig index 1db633e2c940..54fcd75779da 100644 --- a/arch/arm/configs/kafa_defconfig +++ b/arch/arm/configs/kafa_defconfig | |||
@@ -536,9 +536,9 @@ CONFIG_HW_CONSOLE=y | |||
536 | # | 536 | # |
537 | # Non-8250 serial port support | 537 | # Non-8250 serial port support |
538 | # | 538 | # |
539 | CONFIG_SERIAL_AT91=y | 539 | CONFIG_SERIAL_ATMEL=y |
540 | CONFIG_SERIAL_AT91_CONSOLE=y | 540 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
541 | # CONFIG_SERIAL_AT91_TTYAT is not set | 541 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
542 | CONFIG_SERIAL_CORE=y | 542 | CONFIG_SERIAL_CORE=y |
543 | CONFIG_SERIAL_CORE_CONSOLE=y | 543 | CONFIG_SERIAL_CORE_CONSOLE=y |
544 | CONFIG_UNIX98_PTYS=y | 544 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/kb9202_defconfig b/arch/arm/configs/kb9202_defconfig index 45396e087196..b4cd4b414836 100644 --- a/arch/arm/configs/kb9202_defconfig +++ b/arch/arm/configs/kb9202_defconfig | |||
@@ -418,8 +418,8 @@ CONFIG_HW_CONSOLE=y | |||
418 | # | 418 | # |
419 | # Non-8250 serial port support | 419 | # Non-8250 serial port support |
420 | # | 420 | # |
421 | CONFIG_SERIAL_AT91=y | 421 | CONFIG_SERIAL_ATMEL=y |
422 | CONFIG_SERIAL_AT91_CONSOLE=y | 422 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
423 | CONFIG_SERIAL_CORE=y | 423 | CONFIG_SERIAL_CORE=y |
424 | CONFIG_SERIAL_CORE_CONSOLE=y | 424 | CONFIG_SERIAL_CORE_CONSOLE=y |
425 | CONFIG_UNIX98_PTYS=y | 425 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/configs/onearm_defconfig b/arch/arm/configs/onearm_defconfig index 6a93e3aae106..cb1d94f9049e 100644 --- a/arch/arm/configs/onearm_defconfig +++ b/arch/arm/configs/onearm_defconfig | |||
@@ -583,9 +583,9 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 | |||
583 | # | 583 | # |
584 | # Non-8250 serial port support | 584 | # Non-8250 serial port support |
585 | # | 585 | # |
586 | CONFIG_SERIAL_AT91=y | 586 | CONFIG_SERIAL_ATMEL=y |
587 | CONFIG_SERIAL_AT91_CONSOLE=y | 587 | CONFIG_SERIAL_ATMEL_CONSOLE=y |
588 | # CONFIG_SERIAL_AT91_TTYAT is not set | 588 | # CONFIG_SERIAL_ATMEL_TTYAT is not set |
589 | CONFIG_SERIAL_CORE=y | 589 | CONFIG_SERIAL_CORE=y |
590 | CONFIG_SERIAL_CORE_CONSOLE=y | 590 | CONFIG_SERIAL_CORE_CONSOLE=y |
591 | CONFIG_UNIX98_PTYS=y | 591 | CONFIG_UNIX98_PTYS=y |
diff --git a/arch/arm/mach-at91rm9200/devices.c b/arch/arm/mach-at91rm9200/devices.c index 01525530c287..2d6b8b3a74a5 100644 --- a/arch/arm/mach-at91rm9200/devices.c +++ b/arch/arm/mach-at91rm9200/devices.c | |||
@@ -544,7 +544,7 @@ void __init at91_init_leds(u8 cpu_led, u8 timer_led) {} | |||
544 | * UART | 544 | * UART |
545 | * -------------------------------------------------------------------- */ | 545 | * -------------------------------------------------------------------- */ |
546 | 546 | ||
547 | #if defined(CONFIG_SERIAL_AT91) | 547 | #if defined(CONFIG_SERIAL_ATMEL) |
548 | static struct resource dbgu_resources[] = { | 548 | static struct resource dbgu_resources[] = { |
549 | [0] = { | 549 | [0] = { |
550 | .start = AT91_VA_BASE_SYS + AT91_DBGU, | 550 | .start = AT91_VA_BASE_SYS + AT91_DBGU, |