diff options
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/clock.c | 11 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/include/mach/clkdev.h | 7 |
3 files changed, 0 insertions, 19 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9f1f09a2bc9b..495fb7ace4d8 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -646,7 +646,6 @@ config ARCH_SHMOBILE_LEGACY | |||
646 | select GENERIC_CLOCKEVENTS | 646 | select GENERIC_CLOCKEVENTS |
647 | select HAVE_ARM_SCU if SMP | 647 | select HAVE_ARM_SCU if SMP |
648 | select HAVE_ARM_TWD if SMP | 648 | select HAVE_ARM_TWD if SMP |
649 | select HAVE_MACH_CLKDEV | ||
650 | select HAVE_SMP | 649 | select HAVE_SMP |
651 | select MIGHT_HAVE_CACHE_L2X0 | 650 | select MIGHT_HAVE_CACHE_L2X0 |
652 | select MULTI_IRQ_HANDLER | 651 | select MULTI_IRQ_HANDLER |
diff --git a/arch/arm/mach-shmobile/clock.c b/arch/arm/mach-shmobile/clock.c index 34f056fc3756..68c2d06d0eaa 100644 --- a/arch/arm/mach-shmobile/clock.c +++ b/arch/arm/mach-shmobile/clock.c | |||
@@ -45,14 +45,3 @@ int __init shmobile_clk_init(void) | |||
45 | 45 | ||
46 | return 0; | 46 | return 0; |
47 | } | 47 | } |
48 | |||
49 | int __clk_get(struct clk *clk) | ||
50 | { | ||
51 | return 1; | ||
52 | } | ||
53 | EXPORT_SYMBOL(__clk_get); | ||
54 | |||
55 | void __clk_put(struct clk *clk) | ||
56 | { | ||
57 | } | ||
58 | EXPORT_SYMBOL(__clk_put); | ||
diff --git a/arch/arm/mach-shmobile/include/mach/clkdev.h b/arch/arm/mach-shmobile/include/mach/clkdev.h deleted file mode 100644 index 36d0163a857a..000000000000 --- a/arch/arm/mach-shmobile/include/mach/clkdev.h +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | #ifndef __ASM_MACH_CLKDEV_H | ||
2 | #define __ASM_MACH_CLKDEV_H | ||
3 | |||
4 | int __clk_get(struct clk *clk); | ||
5 | void __clk_put(struct clk *clk); | ||
6 | |||
7 | #endif /* __ASM_MACH_CLKDEV_H */ | ||