---

yaml --- r: 267295 b: refs/heads/master c: 0c6967b h: refs/heads/master i: 267293: 0960ae2 267291: 93fc2df 267287: 4e747bb 267279: 8ca7ce1 267263: ed20d5e v: v3
git-mirror · Aug 23, 2011 · 945f4e3 · 945f4e3
1 parent 2b9d5b3
commit 945f4e3
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb7e58f89617861c3dbfde2edcfd08b4044ede67
+refs/heads/master: 0c6967b5a0dd54b936e859398e8a977d24bde2a7
diff --git a/trunk/drivers/tty/serial/Kconfig b/trunk/drivers/tty/serial/Kconfig
@@ -722,7 +722,7 @@ config SERIAL_BFIN
 	  Add support for the built-in UARTs on the Blackfin.
 
 	  To compile this driver as a module, choose M here: the
-	  module will be called bfin_5xx.
+	  module is named bfin_uart.ko.
 
 config SERIAL_BFIN_CONSOLE
 	bool "Console on Blackfin serial port"

diff --git a/trunk/drivers/tty/serial/Makefile b/trunk/drivers/tty/serial/Makefile
@@ -35,7 +35,7 @@ obj-$(CONFIG_SERIAL_PXA) += pxa.o
 obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o
 obj-$(CONFIG_SERIAL_SA1100) += sa1100.o
 obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o
-obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o
+obj-$(CONFIG_SERIAL_BFIN) += bfin_uart.o
 obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o
 obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o
 obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o

diff --git a/trunk/drivers/tty/serial/bfin_5xx.c → trunk/drivers/tty/serial/bfin_uart.c b/trunk/drivers/tty/serial/bfin_5xx.c → trunk/drivers/tty/serial/bfin_uart.c