diff options
-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 @@ | |||
15 | #include <bcm63xx_io.h> | 15 | #include <bcm63xx_io.h> |
16 | #include <bcm63xx_regs.h> | 16 | #include <bcm63xx_regs.h> |
17 | #include <bcm63xx_reset.h> | 17 | #include <bcm63xx_reset.h> |
18 | #include <bcm63xx_clk.h> | 18 | |
19 | struct clk { | ||
20 | void (*set)(struct clk *, int); | ||
21 | unsigned int rate; | ||
22 | unsigned int usage; | ||
23 | int id; | ||
24 | }; | ||
19 | 25 | ||
20 | static DEFINE_MUTEX(clocks_mutex); | 26 | static DEFINE_MUTEX(clocks_mutex); |
21 | 27 | ||
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 @@ | |||
1 | #ifndef BCM63XX_CLK_H_ | ||
2 | #define BCM63XX_CLK_H_ | ||
3 | |||
4 | struct clk { | ||
5 | void (*set)(struct clk *, int); | ||
6 | unsigned int rate; | ||
7 | unsigned int usage; | ||
8 | int id; | ||
9 | }; | ||
10 | |||
11 | #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 @@ | |||
30 | #include <linux/serial.h> | 30 | #include <linux/serial.h> |
31 | #include <linux/serial_core.h> | 31 | #include <linux/serial_core.h> |
32 | 32 | ||
33 | #include <bcm63xx_clk.h> | ||
34 | #include <bcm63xx_irq.h> | 33 | #include <bcm63xx_irq.h> |
35 | #include <bcm63xx_regs.h> | 34 | #include <bcm63xx_regs.h> |
36 | #include <bcm63xx_io.h> | 35 | #include <bcm63xx_io.h> |