---

yaml --- r: 375119 b: refs/heads/master c: 042df4f h: refs/heads/master i: 375117: d62b24a 375115: 692449e 375111: df41fea 375103: 8dd25cd v: v3
git-mirror · May 7, 2013 · f1d76b2 · f1d76b2
1 parent 12b16c8
commit f1d76b2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git 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
@@ -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
diff --git 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>