diff options
| author | Simon Horman <horms@verge.net.au> | 2012-11-08 17:49:35 +0900 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2012-11-08 17:49:35 +0900 |
| commit | ab3ff12a78a64b851ab22726ab99dca6ad37bf94 (patch) | |
| tree | 4340e41495528f1a1dc733b45a792617ff4e8992 /arch/arm/mach-shmobile/board-mackerel.c | |
| parent | 631a7b5d958d2ef2c2333b105794c693642f0641 (diff) | |
| parent | 2944628607f76e4755660cd710f22a4748ef88d8 (diff) | |
| download | talos-obmc-linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.tar.gz talos-obmc-linux-ab3ff12a78a64b851ab22726ab99dca6ad37bf94.zip | |
Merge branch 'soc' into boards
Conflicts:
arch/arm/configs/marzen_defconfig
Diffstat (limited to 'arch/arm/mach-shmobile/board-mackerel.c')
| -rw-r--r-- | arch/arm/mach-shmobile/board-mackerel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c index 39b8f2e70638..f274252e4705 100644 --- a/arch/arm/mach-shmobile/board-mackerel.c +++ b/arch/arm/mach-shmobile/board-mackerel.c @@ -882,7 +882,7 @@ static int __fsi_set_round_rate(struct clk *clk, long rate, int enable) static int fsi_b_set_rate(struct device *dev, int rate, int enable) { struct clk *fsib_clk; - struct clk *fdiv_clk = &sh7372_fsidivb_clk; + struct clk *fdiv_clk = clk_get(NULL, "fsidivb"); long fsib_rate = 0; long fdiv_rate = 0; int ackmd_bpfmd; |
