diff options
author | Sonic Zhang <sonic.zhang@analog.com> | 2011-07-19 06:09:25 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 13:47:05 -0400 |
commit | 0c6967b5a0dd54b936e859398e8a977d24bde2a7 (patch) | |
tree | 4bee6695adb24696091eb5f1665f96cec1d3fd9d | |
parent | bb7e58f89617861c3dbfde2edcfd08b4044ede67 (diff) |
serial:blackfin: rename Blackfin serial driver to bfin_uart.c
bfin_5xx.c is not a general name for all Blackfin chips.
Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
Acked-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/tty/serial/Kconfig | 2 | ||||
-rw-r--r-- | drivers/tty/serial/Makefile | 2 | ||||
-rw-r--r-- | drivers/tty/serial/bfin_uart.c (renamed from drivers/tty/serial/bfin_5xx.c) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 4dcb37bbdf92..a9b307f582e1 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig | |||
@@ -722,7 +722,7 @@ config SERIAL_BFIN | |||
722 | Add support for the built-in UARTs on the Blackfin. | 722 | Add support for the built-in UARTs on the Blackfin. |
723 | 723 | ||
724 | To compile this driver as a module, choose M here: the | 724 | To compile this driver as a module, choose M here: the |
725 | module will be called bfin_5xx. | 725 | module is named bfin_uart.ko. |
726 | 726 | ||
727 | config SERIAL_BFIN_CONSOLE | 727 | config SERIAL_BFIN_CONSOLE |
728 | bool "Console on Blackfin serial port" | 728 | bool "Console on Blackfin serial port" |
diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 83b4da6a1062..78748136ccc8 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile | |||
@@ -35,7 +35,7 @@ obj-$(CONFIG_SERIAL_PXA) += pxa.o | |||
35 | obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o | 35 | obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o |
36 | obj-$(CONFIG_SERIAL_SA1100) += sa1100.o | 36 | obj-$(CONFIG_SERIAL_SA1100) += sa1100.o |
37 | obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o | 37 | obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o |
38 | obj-$(CONFIG_SERIAL_BFIN) += bfin_5xx.o | 38 | obj-$(CONFIG_SERIAL_BFIN) += bfin_uart.o |
39 | obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o | 39 | obj-$(CONFIG_SERIAL_BFIN_SPORT) += bfin_sport_uart.o |
40 | obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o | 40 | obj-$(CONFIG_SERIAL_SAMSUNG) += samsung.o |
41 | obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o | 41 | obj-$(CONFIG_SERIAL_S3C2410) += s3c2410.o |
diff --git a/drivers/tty/serial/bfin_5xx.c b/drivers/tty/serial/bfin_uart.c index e08bc046c1bd..e08bc046c1bd 100644 --- a/drivers/tty/serial/bfin_5xx.c +++ b/drivers/tty/serial/bfin_uart.c | |||