diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-06-19 23:44:25 +0200 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2012-07-11 15:36:45 -0700 |
| commit | 50667d63085af108f625c83102430c1d74931d78 (patch) | |
| tree | 62285dcaf8733ef5e9257db9ec6029ca7745c26c /arch/arm/mach-u300/Makefile | |
| parent | 9ca1c5a4bf4105d6f2f2a46892495953dd3e2fec (diff) | |
ARM: u300: convert to common clock
This converts the U300 clock implementation over to use the common
struct clk and moves the implementation down into drivers/clk.
Since VCO isn't used in tree it was removed, it's not hard to
put it back in if need be.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[mturquette@linaro.org: trivial Makefile conflict]
Signed-off-by: Mike Turquette <mturquette@linaro.org>
Diffstat (limited to 'arch/arm/mach-u300/Makefile')
| -rw-r--r-- | arch/arm/mach-u300/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-u300/Makefile b/arch/arm/mach-u300/Makefile index fd3a5c382f47..7e47d37aeb0e 100644 --- a/arch/arm/mach-u300/Makefile +++ b/arch/arm/mach-u300/Makefile @@ -2,7 +2,7 @@ # Makefile for the linux kernel, U300 machine. # -obj-y := core.o clock.o timer.o +obj-y := core.o timer.o obj-m := obj-n := obj- := |