[U-Boot] Compilation warning: "MSR_RI" redefined

[Wolfgang Denk]

Dear Detlev,

In message <m2r60a9ejj.fsf at ohwell.denx.de> you wrote:
>
> Attached is a patch which fixes this fallout and starts a round of
> cleanups.

Please submit patches inline, not as attachments!

> Subject: [PATCH] Rename common ns16550 constants with UART_ prefix to prevent conflicts
> 
> Fix problems introduced in commit
> 7b5611cdd12ca0cc33f994f0d4a4454788fc3124 [inka4x0: Add hardware
> diagnosis functions for inka4x0] which redefined MSR_RI which is
> already used on PowerPC systems.
> 
> Also eliminate redundant definitions in ps2mult.h.  More cleanup will
> be needed for other redundant occurrences though.
> 
> Signed-off-by: Detlev Zundel <dzu at denx.de>
> ---
>  board/inka4x0/inkadiag.c |   20 ++++----
>  board/linkstation/avr.c  |    6 +-
>  drivers/input/ps2ser.c   |   22 ++++----
>  drivers/serial/ns16550.c |   39 +++++++------
>  include/ns16550.h        |  135 +++++++++++++++++++++++++++++++--------------
>  include/ps2mult.h        |   99 ---------------------------------
>  6 files changed, 139 insertions(+), 182 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk

-- 
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
[Doctors and Bartenders], We both get the same two kinds of customers
-- the living and the dying.
	-- Dr. Boyce, "The Menagerie" ("The Cage"), stardate unknown