From f41d345745c8d5765b706c2e5a8ccb8f461c332e Mon Sep 17 00:00:00 2001
From: Borislav Petkov <bp@suse.de>
Date: Sun, 20 Jan 2013 10:24:28 +0000
Subject: [PATCH] --- yaml --- r: 351016 b: refs/heads/master c:
 9d95046e5d6afd6d7ae86fb71ab59c6faf0db8de h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/cpufreq/cpufreq.c | 14 ++++++++++++++
 trunk/include/linux/cpufreq.h   |  1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 5f3533cff1b1..a3725800d818 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 741220ea86709717e1d392b5a9617dfe90cd3802
+refs/heads/master: 9d95046e5d6afd6d7ae86fb71ab59c6faf0db8de
diff --git a/trunk/drivers/cpufreq/cpufreq.c b/trunk/drivers/cpufreq/cpufreq.c
index 2417576393a6..216c104d51ad 100644
--- a/trunk/drivers/cpufreq/cpufreq.c
+++ b/trunk/drivers/cpufreq/cpufreq.c
@@ -1395,6 +1395,20 @@ static struct syscore_ops cpufreq_syscore_ops = {
 	.resume		= cpufreq_bp_resume,
 };
 
+/**
+ *	cpufreq_get_current_driver - return current driver's name
+ *
+ *	Return the name string of the currently loaded cpufreq driver
+ *	or NULL, if none.
+ */
+const char *cpufreq_get_current_driver(void)
+{
+	if (cpufreq_driver)
+		return cpufreq_driver->name;
+
+	return NULL;
+}
+EXPORT_SYMBOL_GPL(cpufreq_get_current_driver);
 
 /*********************************************************************
  *                     NOTIFIER LISTS INTERFACE                      *
diff --git a/trunk/include/linux/cpufreq.h b/trunk/include/linux/cpufreq.h
index 52be2d0c994a..1f3a726640e8 100644
--- a/trunk/include/linux/cpufreq.h
+++ b/trunk/include/linux/cpufreq.h
@@ -411,4 +411,5 @@ void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table,
 void cpufreq_frequency_table_update_policy_cpu(struct cpufreq_policy *policy);
 
 void cpufreq_frequency_table_put_attr(unsigned int cpu);
+const char *cpufreq_get_current_driver(void);
 #endif /* _LINUX_CPUFREQ_H */