diff options
author | Paul Mackerras <paulus@samba.org> | 2008-02-06 19:21:09 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-02-06 19:21:09 -0500 |
commit | 1f7d4f8395093021ed2262296179cfe71bd5e2ec (patch) | |
tree | 30c69554b5a249ed5b90c52388165545df154c40 /drivers/serial/Kconfig | |
parent | b370b08274a25cf1e2015fb7ce65c43173c8156f (diff) | |
parent | 25ae3a0739c69425a911925b43213895a9802b98 (diff) |
Merge branch 'for-2.6.25' of git://git.secretlab.ca/git/linux-2.6-mpc52xx into for-2.6.25
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 4fa7927997ad..ddfb1eab7363 100644 --- a/drivers/serial/Kconfig +++ b/drivers/serial/Kconfig | |||
@@ -1138,17 +1138,17 @@ config SERIAL_SGI_L1_CONSOLE | |||
1138 | say Y. Otherwise, say N. | 1138 | say Y. Otherwise, say N. |
1139 | 1139 | ||
1140 | config SERIAL_MPC52xx | 1140 | config SERIAL_MPC52xx |
1141 | tristate "Freescale MPC52xx family PSC serial support" | 1141 | tristate "Freescale MPC52xx/MPC512x family PSC serial support" |
1142 | depends on PPC_MPC52xx | 1142 | depends on PPC_MPC52xx || PPC_MPC512x |
1143 | select SERIAL_CORE | 1143 | select SERIAL_CORE |
1144 | help | 1144 | help |
1145 | This drivers support the MPC52xx PSC serial ports. If you would | 1145 | This driver supports MPC52xx and MPC512x PSC serial ports. If you would |
1146 | like to use them, you must answer Y or M to this option. Not that | 1146 | like to use them, you must answer Y or M to this option. Note that |
1147 | for use as console, it must be included in kernel and not as a | 1147 | for use as console, it must be included in kernel and not as a |
1148 | module. | 1148 | module. |
1149 | 1149 | ||
1150 | config SERIAL_MPC52xx_CONSOLE | 1150 | config SERIAL_MPC52xx_CONSOLE |
1151 | bool "Console on a Freescale MPC52xx family PSC serial port" | 1151 | bool "Console on a Freescale MPC52xx/MPC512x family PSC serial port" |
1152 | depends on SERIAL_MPC52xx=y | 1152 | depends on SERIAL_MPC52xx=y |
1153 | select SERIAL_CORE_CONSOLE | 1153 | select SERIAL_CORE_CONSOLE |
1154 | help | 1154 | help |
@@ -1156,7 +1156,7 @@ config SERIAL_MPC52xx_CONSOLE | |||
1156 | of the Freescale MPC52xx family as a console. | 1156 | of the Freescale MPC52xx family as a console. |
1157 | 1157 | ||
1158 | config SERIAL_MPC52xx_CONSOLE_BAUD | 1158 | config SERIAL_MPC52xx_CONSOLE_BAUD |
1159 | int "Freescale MPC52xx family PSC serial port baud" | 1159 | int "Freescale MPC52xx/MPC512x family PSC serial port baud" |
1160 | depends on SERIAL_MPC52xx_CONSOLE=y | 1160 | depends on SERIAL_MPC52xx_CONSOLE=y |
1161 | default "9600" | 1161 | default "9600" |
1162 | help | 1162 | help |