1 From 715d03e5409fac9cbe76fd802db49ca15158378f Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Sat, 30 Mar 2013 20:31:48 +0100
4 Subject: [PATCH] MIPS: BCM63XX: merge bcm63xx_clk.h into bcm63xx/clk.c
6 All the header file does is provide the internal structure of clk,
7 which shouldn't be used by anyone except clk.c itself anyway.
9 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
11 arch/mips/bcm63xx/clk.c | 8 +++++++-
12 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h | 11 -----------
13 drivers/tty/serial/bcm63xx_uart.c | 1 -
14 3 files changed, 7 insertions(+), 13 deletions(-)
15 delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
17 --- a/arch/mips/bcm63xx/clk.c
18 +++ b/arch/mips/bcm63xx/clk.c
20 #include <bcm63xx_io.h>
21 #include <bcm63xx_regs.h>
22 #include <bcm63xx_reset.h>
23 -#include <bcm63xx_clk.h>
26 + void (*set)(struct clk *, int);
32 static DEFINE_MUTEX(clocks_mutex);
34 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
37 -#ifndef BCM63XX_CLK_H_
38 -#define BCM63XX_CLK_H_
41 - void (*set)(struct clk *, int);
47 -#endif /* ! BCM63XX_CLK_H_ */
48 --- a/drivers/tty/serial/bcm63xx_uart.c
49 +++ b/drivers/tty/serial/bcm63xx_uart.c
51 #include <linux/serial.h>
52 #include <linux/serial_core.h>
54 -#include <bcm63xx_clk.h>
55 #include <bcm63xx_irq.h>
56 #include <bcm63xx_regs.h>
57 #include <bcm63xx_io.h>