]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
MIPS: Alchemy: remove duplicate UART register offset definitions
authorManuel Lauss <manuel.lauss@gmail.com>
Thu, 27 Mar 2014 06:42:29 +0000 (07:42 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 31 Mar 2014 08:16:53 +0000 (10:16 +0200)
commit61d3edb862716c4ab8d7d7fec48101b4d35e9e52
treebd6ad05f907da9b7f7ae65648ff5779d811a96ad
parente60865572f81fb2687163fd37ea37cd4283e0bce
MIPS: Alchemy: remove duplicate UART register offset definitions

The UART register names are identical to the ones in uapi/linux/serial_reg.h,
which causes build failures in various drivers when they indirectly pull in
the au1000.h header, for example via gpio.h:

In file included from arch/mips/include/asm/mach-au1x00/gpio.h:13:0,
                 from arch/mips/include/asm/gpio.h:4,
                 from include/linux/gpio.h:48,
                 from include/linux/ssb/ssb.h:9,
                 from drivers/ssb/driver_mipscore.c:11:
arch/mips/include/asm/mach-au1x00/au1000.h:1171:0: note: this is the location of the previous definition
 #define UART_LSR 0x1C /* Line Status Register */

Get rid of the altogether, nothing in the core Alchemy code depends
on them any more.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: Linux-MIPS <linux-mips@linux-mips.org>
Patchwork: https://patchwork.linux-mips.org/patch/6664/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/mach-au1x00/au1000.h