From 14f698d14f319afa9ff9ff48088ab6353be969e1 Mon Sep 17 00:00:00 2001
From: Kevin Hilman <khilman@ti.com>
Date: Fri, 30 Sep 2011 10:41:26 -0700
Subject: [PATCH] --- yaml --- r: 283499 b: refs/heads/master c:
 c1b547bc222f4027d9394b6bd8f4a6bb0bd7b1b4 h: refs/heads/master i:   283497:
 90e471dd19486f485645b823f5da4f2a581aaef5   283495:
 8f3999d99f94873d46e94fe7bf4b5c68131886e9 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/cpufreq/omap-cpufreq.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index d41460daf6af..49ad2dc57c14 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c78217fc8c0983f5768a2d1c17c022f1079751e
+refs/heads/master: c1b547bc222f4027d9394b6bd8f4a6bb0bd7b1b4
diff --git a/trunk/drivers/cpufreq/omap-cpufreq.c b/trunk/drivers/cpufreq/omap-cpufreq.c
index ad94b4f2892c..5d04c57aae30 100644
--- a/trunk/drivers/cpufreq/omap-cpufreq.c
+++ b/trunk/drivers/cpufreq/omap-cpufreq.c
@@ -24,6 +24,7 @@
 #include <linux/io.h>
 #include <linux/opp.h>
 #include <linux/cpu.h>
+#include <linux/module.h>
 
 #include <asm/system.h>
 #include <asm/smp_plat.h>
@@ -32,6 +33,7 @@
 #include <plat/clock.h>
 #include <plat/omap-pm.h>
 #include <plat/common.h>
+#include <plat/omap_device.h>
 
 #include <mach/hardware.h>
 
@@ -252,7 +254,7 @@ static int __init omap_cpufreq_init(void)
 		return -EINVAL;
 	}
 
-	mpu_dev = omap2_get_mpuss_device();
+	mpu_dev = omap_device_get_by_hwmod_name("mpu");
 	if (!mpu_dev) {
 		pr_warning("%s: unable to get the mpu device\n", __func__);
 		return -EINVAL;