1 files changed, 0 insertions, 68 deletions
diff --git a/packages/linux/linux-omap/mru-add-clk-get-parent.diff b/packages/linux/linux-omap/mru-add-clk-get-parent.diff
deleted file mode 100644
index 4488b311a0..0000000000
--- a/packages/linux/linux-omap/mru-add-clk-get-parent.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-From 2414b5ac7596904dd8951619316b63d644f544db Mon Sep 17 00:00:00 2001
-From: Mans Rullgard <mans@mansr.com>
-Date: Tue, 22 Jul 2008 01:58:18 +0100
-Subject: [PATCH] ARM: OMAP: add clk_get_parent() for OMAP2/3
-
-Signed-off-by: Mans Rullgard <mans@mansr.com>
----
- arch/arm/mach-omap2/clock.c     |    5 +++++
- arch/arm/mach-omap2/clock.h     |    1 +
- arch/arm/mach-omap2/clock24xx.c |    1 +
- arch/arm/mach-omap2/clock34xx.c |    1 +
- 4 files changed, 8 insertions(+), 0 deletions(-)
-
-diff --git a/arch/arm/mach-omap2/clock.c b/arch/arm/mach-omap2/clock.c
-index c3af24e..9e502a0 100644
---- a/arch/arm/mach-omap2/clock.c
-+++ b/arch/arm/mach-omap2/clock.c
-@@ -817,6 +817,11 @@ int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent)
- 	return 0;
- }
- 
-+struct clk *omap2_clk_get_parent(struct clk *clk)
-+{
-+	return clk->parent;
-+}
-+
- /* DPLL rate rounding code */
- 
- /**
-diff --git a/arch/arm/mach-omap2/clock.h b/arch/arm/mach-omap2/clock.h
-index bcb0c03..a5183d0 100644
---- a/arch/arm/mach-omap2/clock.h
-+++ b/arch/arm/mach-omap2/clock.h
-@@ -29,6 +29,7 @@ int omap2_clk_set_rate(struct clk *clk, unsigned long rate);
- int omap2_clk_set_parent(struct clk *clk, struct clk *new_parent);
- int omap2_dpll_set_rate_tolerance(struct clk *clk, unsigned int tolerance);
- long omap2_dpll_round_rate(struct clk *clk, unsigned long target_rate);
-+struct clk *omap2_clk_get_parent(struct clk *clk);
- 
- #ifdef CONFIG_OMAP_RESET_CLOCKS
- void omap2_clk_disable_unused(struct clk *clk);
-diff --git a/arch/arm/mach-omap2/clock24xx.c b/arch/arm/mach-omap2/clock24xx.c
-index a54f10f..4382e60 100644
---- a/arch/arm/mach-omap2/clock24xx.c
-+++ b/arch/arm/mach-omap2/clock24xx.c
-@@ -416,6 +416,7 @@ static struct clk_functions omap2_clk_functions = {
- 	.clk_round_rate		= omap2_clk_round_rate,
- 	.clk_set_rate		= omap2_clk_set_rate,
- 	.clk_set_parent		= omap2_clk_set_parent,
-+	.clk_get_parent		= omap2_clk_get_parent,
- 	.clk_disable_unused	= omap2_clk_disable_unused,
- #ifdef	CONFIG_CPU_FREQ
- 	.clk_init_cpufreq_table	= omap2_clk_init_cpufreq_table,
-diff --git a/arch/arm/mach-omap2/clock34xx.c b/arch/arm/mach-omap2/clock34xx.c
-index cc43f4f..2a1a6b1 100644
---- a/arch/arm/mach-omap2/clock34xx.c
-+++ b/arch/arm/mach-omap2/clock34xx.c
-@@ -635,6 +635,7 @@ static struct clk_functions omap2_clk_functions = {
- 	.clk_round_rate		= omap2_clk_round_rate,
- 	.clk_set_rate		= omap2_clk_set_rate,
- 	.clk_set_parent		= omap2_clk_set_parent,
-+	.clk_get_parent		= omap2_clk_get_parent,
- 	.clk_disable_unused	= omap2_clk_disable_unused,
- };
- 
--- 
-1.5.6.3
-