diff options
author | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-12-03 23:59:07 -0500 |
commit | 79acbb3ff2d8095b692e1502b9eb2ccec348de26 (patch) | |
tree | 6ab773e5a8f9de2cd6443362b21d0d6fffe3b35e /drivers/serial/Kconfig | |
parent | 19a79859e168640f8e16d7b216d211c1c52b687a (diff) | |
parent | 2b5f6dcce5bf94b9b119e9ed8d537098ec61c3d2 (diff) |
Merge branch 'linux-2.6' into for-linus
Diffstat (limited to 'drivers/serial/Kconfig')
-rw-r--r-- | drivers/serial/Kconfig | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/serial/Kconfig b/drivers/serial/Kconfig index b0d502622d94..0b71e7d18903 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -767,37 +767,37 @@ config SERIAL_CPM_SCC1 | |||
767 | bool "Support for SCC1 serial port" | 767 | bool "Support for SCC1 serial port" |
768 | depends on SERIAL_CPM=y | 768 | depends on SERIAL_CPM=y |
769 | help | 769 | help |
770 | Select the is option to use SCC1 as a serial port | 770 | Select this option to use SCC1 as a serial port |
771 | 771 | ||
772 | config SERIAL_CPM_SCC2 | 772 | config SERIAL_CPM_SCC2 |
773 | bool "Support for SCC2 serial port" | 773 | bool "Support for SCC2 serial port" |
774 | depends on SERIAL_CPM=y | 774 | depends on SERIAL_CPM=y |
775 | help | 775 | help |
776 | Select the is option to use SCC2 as a serial port | 776 | Select this option to use SCC2 as a serial port |
777 | 777 | ||
778 | config SERIAL_CPM_SCC3 | 778 | config SERIAL_CPM_SCC3 |
779 | bool "Support for SCC3 serial port" | 779 | bool "Support for SCC3 serial port" |
780 | depends on SERIAL_CPM=y | 780 | depends on SERIAL_CPM=y |
781 | help | 781 | help |
782 | Select the is option to use SCC3 as a serial port | 782 | Select this option to use SCC3 as a serial port |
783 | 783 | ||
784 | config SERIAL_CPM_SCC4 | 784 | config SERIAL_CPM_SCC4 |
785 | bool "Support for SCC4 serial port" | 785 | bool "Support for SCC4 serial port" |
786 | depends on SERIAL_CPM=y | 786 | depends on SERIAL_CPM=y |
787 | help | 787 | help |
788 | Select the is option to use SCC4 as a serial port | 788 | Select this option to use SCC4 as a serial port |
789 | 789 | ||
790 | config SERIAL_CPM_SMC1 | 790 | config SERIAL_CPM_SMC1 |
791 | bool "Support for SMC1 serial port" | 791 | bool "Support for SMC1 serial port" |
792 | depends on SERIAL_CPM=y | 792 | depends on SERIAL_CPM=y |
793 | help | 793 | help |
794 | Select the is option to use SMC1 as a serial port | 794 | Select this option to use SMC1 as a serial port |
795 | 795 | ||
796 | config SERIAL_CPM_SMC2 | 796 | config SERIAL_CPM_SMC2 |
797 | bool "Support for SMC2 serial port" | 797 | bool "Support for SMC2 serial port" |
798 | depends on SERIAL_CPM=y | 798 | depends on SERIAL_CPM=y |
799 | help | 799 | help |
800 | Select the is option to use SMC2 as a serial port | 800 | Select this option to use SMC2 as a serial port |
801 | 801 | ||
802 | config SERIAL_SGI_L1_CONSOLE | 802 | config SERIAL_SGI_L1_CONSOLE |
803 | bool "SGI Altix L1 serial console support" | 803 | bool "SGI Altix L1 serial console support" |