From 945f4e32fbcb630265c228b92d735ed17db3630a Mon Sep 17 00:00:00 2001 From: Sonic Zhang Date: Tue, 19 Jul 2011 18:09:25 +0800 Subject: [PATCH] --- yaml --- r: 267295 b: refs/heads/master c: 0c6967b5a0dd54b936e859398e8a977d24bde2a7 h: refs/heads/master i: 267293: 0960ae2382e372fa527d47877e56063b585aa534 267291: 93fc2df07a387e098daa001a422872dcaebef4e7 267287: 4e747bbad8a06ad8a1d11afdecb4783ff5db1739 267279: 8ca7ce1ef3b2affb55735f964799bbfa78d014e5 267263: ed20d5e1841eeedddf130c032b316d7a87d55cc3 v: v3 --- [refs] | 2 +- trunk/drivers/tty/serial/Kconfig | 2 +- trunk/drivers/tty/serial/Makefile | 2 +- trunk/drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename trunk/drivers/tty/serial/{bfin_5xx.c => bfin_uart.c} (100%) diff --git a/[refs] b/[refs] index 043eee479859..e025976704a1 100644 --- 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 index 4dcb37bbdf92..a9b307f582e1 100644 --- 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 index 83b4da6a1062..78748136ccc8 100644 --- 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 b/trunk/drivers/tty/serial/bfin_uart.c similarity index 100% rename from trunk/drivers/tty/serial/bfin_5xx.c rename to trunk/drivers/tty/serial/bfin_uart.c