[PATCH] Cleanup some more collateral damage from renaming

[Sascha Hauer]

Hi Marc,

On Tue, Dec 15, 2009 at 09:34:58PM +0100, Marc Kleine-Budde wrote:
> Hello,
> 
> as the subject says some collateral damage fixes.
> 
> cheers, Marc
> 
> P.S.:
> 
> If you want to pull:

pulled, thanks

 Sascha

> 
> --
> 
> The following changes since commit 2ed0bbbc37f39c95c695fdc140a46e9625f8b3de:
>   Robert Schwebel (1):
>         README: add release rules
> 
> are available in the git repository at:
> 
>   git://git.pengutronix.de/git/mkl/barebox.git for-sha-collateral
> 
> Marc Kleine-Budde (1):
>       Cleanup some more collateral damage from renaming
> 
>  arch/arm/mach-omap/omap3_clock_core.S |    2 +-
>  board/freescale-mx35-3-stack/3stack.c |    2 +-
>  drivers/nor/Kconfig                   |    2 +-
>  drivers/serial/serial_ns16550.c       |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> --
> 
> From ca8ec6c9d57e882404abb40d020e2a2413b77ce3 Mon Sep 17 00:00:00 2001
> From: Marc Kleine-Budde <mkl at pengutronix.de>
> Date: Tue, 15 Dec 2009 21:22:30 +0100
> Subject: [PATCH] Cleanup some more collateral damage from renaming
> 
> Signed-off-by: Marc Kleine-Budde <mkl at pengutronix.de>
> ---
>  arch/arm/mach-omap/omap3_clock_core.S |    2 +-
>  board/freescale-mx35-3-stack/3stack.c |    2 +-
>  drivers/nor/Kconfig                   |    2 +-
>  drivers/serial/serial_ns16550.c       |    2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/arm/mach-omap/omap3_clock_core.S b/arch/arm/mach-omap/omap3_clock_core.S
> index 21a1902..872ae5a 100644
> --- a/arch/arm/mach-omap/omap3_clock_core.S
> +++ b/arch/arm/mach-omap/omap3_clock_core.S
> @@ -12,7 +12,7 @@
>   * configurations while running in SDRAM/Flash. This provides
>   * relocation and execution capability for the same.
>   *
> - * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/barebox-v1.tar.gz
> + * Orignally from http://linux.omap.com/pub/bootloader/3430sdp/u-boot-v1.tar.gz
>   */
>  /*
>   * (C) Copyright 2006-2008
> diff --git a/board/freescale-mx35-3-stack/3stack.c b/board/freescale-mx35-3-stack/3stack.c
> index 77dcf7a..e541966 100644
> --- a/board/freescale-mx35-3-stack/3stack.c
> +++ b/board/freescale-mx35-3-stack/3stack.c
> @@ -19,7 +19,7 @@
>   *
>   * Derived from:
>   *
> - * * mx35_3stack.c - board file for barebox-v1
> + * * mx35_3stack.c - board file for uboot-v1
>   *   Copyright (C) 2007, Guennadi Liakhovetski <lg at denx.de>
>   *   (C) Copyright 2008-2009 Freescale Semiconductor, Inc.
>   *
> diff --git a/drivers/nor/Kconfig b/drivers/nor/Kconfig
> index db07aa3..7d9497e 100644
> --- a/drivers/nor/Kconfig
> +++ b/drivers/nor/Kconfig
> @@ -14,7 +14,7 @@ config DRIVER_CFI_NEW
>  	default y
>  	bool "new cfi flash driver"
>  	help
> -	  The old cfi flash driver is mainly an adopted version from barebox v1
> +	  The old cfi flash driver is mainly an adopted version from U-Boot v1
>  	  whereas the new driver contains some more experimental features such
>  	  as selecting the supported chiptypes and bus widths making the driver
>  	  smaller.
> diff --git a/drivers/serial/serial_ns16550.c b/drivers/serial/serial_ns16550.c
> index 1385bda..290619f 100644
> --- a/drivers/serial/serial_ns16550.c
> +++ b/drivers/serial/serial_ns16550.c
> @@ -63,7 +63,7 @@ static unsigned int ns16550_calc_divisor(struct console_device *cdev,
>  	    cdev->dev->platform_data;
>  	unsigned int clk = plat->clock;
>  #ifdef CONFIG_DRIVER_SERIAL_NS16550_OMAP_EXTENSIONS
> -	/* FIXME: Legacy Code copied from barebox V1 implementation
> +	/* FIXME: Legacy Code copied from U-Boot V1 implementation
>  	 */
>  #ifdef CONFIG_ARCH_OMAP1510
>  	unsigned long base = cdev->dev->map_base;
> -- 
> 1.6.5.4
> 
> 
> _______________________________________________
> u-boot-v2 mailing list
> u-boot-v2 at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/u-boot-v2
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |