58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
From 715d03e5409fac9cbe76fd802db49ca15158378f Mon Sep 17 00:00:00 2001
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
|
Date: Sat, 30 Mar 2013 20:31:48 +0100
|
|
Subject: [PATCH] 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>
|
|
---
|
|
arch/mips/bcm63xx/clk.c | 8 +++++++-
|
|
arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h | 11 -----------
|
|
drivers/tty/serial/bcm63xx_uart.c | 1 -
|
|
3 files changed, 7 insertions(+), 13 deletions(-)
|
|
delete mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
|
|
|
|
--- 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);
|
|
|
|
--- 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_ */
|
|
--- 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>
|