diff options
| author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-22 20:53:19 +0400 |
|---|---|---|
| committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2012-06-22 20:53:19 +0400 |
| commit | 0b9d19a18409543bee3ab700cd51117d6d064c5e (patch) | |
| tree | 9de6dee6dcf1a874972cc254c9a5497336e886d4 | |
| parent | 3d89a91e4e074855f27870767c66d0d51c50115f (diff) | |
Remove references to <mach-vexpress/clkdev.h>tracking-ll-last-minute-fixes-ll-20120625.0tracking-ll-last-minute-fixes-ll-20120622.0
Fix the merge error.
arch/arm/mach-vexpress/include/mach-vexpress/clkdev.h has been
deleted by commit 95f3b85390db3d729dd338882adf33ce82e3bcc2
"ARM: vexpress: Initial common clock support".
Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
| -rw-r--r-- | arch/arm/mach-vexpress/ct-ca9x4.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-vexpress/v2m.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/arch/arm/mach-vexpress/ct-ca9x4.c b/arch/arm/mach-vexpress/ct-ca9x4.c index 8dda041010f..488a6993a37 100644 --- a/arch/arm/mach-vexpress/ct-ca9x4.c +++ b/arch/arm/mach-vexpress/ct-ca9x4.c @@ -9,7 +9,6 @@ #include <linux/amba/bus.h> #include <linux/amba/clcd.h> #include <linux/clkdev.h> -#include <mach-vexpress/clkdev.h> #include <asm/hardware/arm_timer.h> #include <asm/hardware/cache-l2x0.h> diff --git a/arch/arm/mach-vexpress/v2m.c b/arch/arm/mach-vexpress/v2m.c index 9aa733fe621..b1f1e56db00 100644 --- a/arch/arm/mach-vexpress/v2m.c +++ b/arch/arm/mach-vexpress/v2m.c @@ -35,7 +35,6 @@ #include <mach-vexpress/ct-ca9x4.h> #include <mach-vexpress/motherboard.h> -#include <mach-vexpress/clkdev.h> #include <plat-versatile/sched_clock.h> |