diff options
| author | Jonas Gorski | 2013-04-06 12:31:02 +0200 |
|---|---|---|
| committer | Ralf Baechle | 2013-05-08 01:19:04 +0200 |
| commit | 042df4fa28a459ac425cea9bc81764532c267ba4 (patch) | |
| tree | f581a8e14fc0a93e02d8d5bc1f439d066e330d9b | |
| parent | MIPS: BCM63XX: add flash detection for BCM6362 (diff) | |
| download | kernel-qcow2-linux-042df4fa28a459ac425cea9bc81764532c267ba4.tar.gz kernel-qcow2-linux-042df4fa28a459ac425cea9bc81764532c267ba4.tar.xz kernel-qcow2-linux-042df4fa28a459ac425cea9bc81764532c267ba4.zip | |
MIPS: BCM63XX: merge bcm63xx_clk.h into bcm63xx/clk.c
All the header file does is provide the internal structure of clk,
which shouldn't be used by anyone except clk.c itself anyway.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Patchwork: http://patchwork.linux-mips.org/patch/5055/
Acked-by: John Crispin <blogic@openwrt.org>
| -rw-r--r-- | arch/mips/bcm63xx/clk.c | 8 | ||||
| -rw-r--r-- | arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h | 11 | ||||
| -rw-r--r-- | drivers/tty/serial/bcm63xx_uart.c | 1 |
3 files changed, 7 insertions, 13 deletions
diff --git a/arch/mips/bcm63xx/clk.c b/arch/mips/bcm63xx/clk.c index e357d55818ab..660121434d7f 100644 --- a/arch/mips/bcm63xx/clk.c +++ b/arch/mips/bcm63xx/clk.c @@ -15,7 +15,13 @@ #include <bcm63xx_io.h> #include <bcm63xx_regs.h> #include <bcm63xx_reset.h> -#include <bcm63xx_clk.h> + +struct clk { + void (*set)(struct clk *, int); + unsigned int rate; + unsigned int usage; + int id; +}; static DEFINE_MUTEX(clocks_mutex); diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h deleted file mode 100644 index 8fcf8df4418a..000000000000 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h +++ /dev/null @@ -1,11 +0,0 @@ -#ifndef BCM63XX_CLK_H_ -#define BCM63XX_CLK_H_ - -struct clk { - void (*set)(struct clk *, int); - unsigned int rate; - unsigned int usage; - int id; -}; - -#endif /* ! BCM63XX_CLK_H_ */ diff --git a/drivers/tty/serial/bcm63xx_uart.c b/drivers/tty/serial/bcm63xx_uart.c index 52a3ecd40421..6fa2ae77fffd 100644 --- a/drivers/tty/serial/bcm63xx_uart.c +++ b/drivers/tty/serial/bcm63xx_uart.c @@ -30,7 +30,6 @@ #include <linux/serial.h> #include <linux/serial_core.h> -#include <bcm63xx_clk.h> #include <bcm63xx_irq.h> #include <bcm63xx_regs.h> #include <bcm63xx_io.h> |