From f1d76b28a4abfadc1a1c5c05dbe543a1e4307cea Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Sat, 6 Apr 2013 10:31:02 +0000
Subject: [PATCH] --- yaml --- r: 375119 b: refs/heads/master c:
 042df4fa28a459ac425cea9bc81764532c267ba4 h: refs/heads/master i:   375117:
 d62b24af1319a80ea2f097d3ac41d011da15af5f   375115:
 692449e8c54d042b155dc74b2acc20d2385922dd   375111:
 df41fea2d253626955c7ffa906cf1f64b8a89e0c   375103:
 8dd25cd0b8aab1fb28c042bb23044afce404489a v: v3

---
 [refs]                                                |  2 +-
 trunk/arch/mips/bcm63xx/clk.c                         |  8 +++++++-
 .../arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h  | 11 -----------
 trunk/drivers/tty/serial/bcm63xx_uart.c               |  1 -
 4 files changed, 8 insertions(+), 14 deletions(-)
 delete mode 100644 trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h

diff --git a/[refs] b/[refs]
index 3e008aad2270..25077bd714d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab8ed9820f5645d0b5b81ef17bbcbd1cdd43a4fa
+refs/heads/master: 042df4fa28a459ac425cea9bc81764532c267ba4
diff --git a/trunk/arch/mips/bcm63xx/clk.c b/trunk/arch/mips/bcm63xx/clk.c
index e357d55818ab..660121434d7f 100644
--- a/trunk/arch/mips/bcm63xx/clk.c
+++ b/trunk/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/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h b/trunk/arch/mips/include/asm/mach-bcm63xx/bcm63xx_clk.h
deleted file mode 100644
index 8fcf8df4418a..000000000000
--- a/trunk/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/trunk/drivers/tty/serial/bcm63xx_uart.c b/trunk/drivers/tty/serial/bcm63xx_uart.c
index 52a3ecd40421..6fa2ae77fffd 100644
--- a/trunk/drivers/tty/serial/bcm63xx_uart.c
+++ b/trunk/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>