Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
0fa272e5 · Linus Torvalds · 5157e5c7 · ae0f55b0 · 0fa272e5
Commit 0fa272e5 authored Apr 21, 2004 by Linus Torvalds
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/serial/Kconfig drivers/serial/Kconfig +1 -1

No files found.
--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -205,7 +205,7 @@ config SERIAL_AMBA_PL011
 	depends on ARM_AMBA
 	select SERIAL_CORE
 	help
-	  This selects the ARM(R) AMBA(R) PrimeCell PL010 UART.  If you have
+	  This selects the ARM(R) AMBA(R) PrimeCell PL011 UART.  If you have
 	  an Integrator/PP2, Integrator/CP or Versatile platform, say Y or M
 	  here.