diff options
| author | Florian Fainelli <florian@openwrt.org> | 2013-12-05 18:26:08 -0800 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2014-01-23 13:02:36 +0100 |
| commit | e95acd3d0d3a7bac9bca50c51a1d86777b6334eb (patch) | |
| tree | ae1829027d2e518175d18fe7c2c5446c517b5a75 | |
| parent | d29e0d04b40f7ce6cfc4342e839b6da179e23bd2 (diff) | |
| download | op-kernel-dev-e95acd3d0d3a7bac9bca50c51a1d86777b6334eb.zip op-kernel-dev-e95acd3d0d3a7bac9bca50c51a1d86777b6334eb.tar.gz | |
MIPS: BCM63XX: use linux/serial_bcm63xx.h
Update the early_printk code to include linux/serial_bcm63xx.h which
provides the definitions for the UART block registers. While at it,
remove the inclusion of serial_bcm63xx.h which was just there to allow
smooth transition.
Signed-off-by: Florian Fainelli <florian@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6203/
| -rw-r--r-- | arch/mips/bcm63xx/early_printk.c | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/arch/mips/bcm63xx/early_printk.c b/arch/mips/bcm63xx/early_printk.c index aa8f7f9..f92f1a2 100644 --- a/arch/mips/bcm63xx/early_printk.c +++ b/arch/mips/bcm63xx/early_printk.c @@ -8,7 +8,7 @@ #include <linux/init.h> #include <bcm63xx_io.h> -#include <bcm63xx_regs.h> +#include <linux/serial_bcm63xx.h> static void wait_xfered(void) { diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h index 96a2d2c..ab427f8 100644 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h @@ -463,13 +463,6 @@ #define WDT_SOFTRESET_REG 0xc /************************************************************************* - * _REG relative to RSET_UARTx - *************************************************************************/ - -#include <linux/serial_bcm63xx.h> - - -/************************************************************************* * _REG relative to RSET_GPIO *************************************************************************/ |
