diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-27 20:25:59 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-10-27 20:25:59 -0400 |
| commit | 8d58199fe7f5581680fae6ca4dc341ca7cbe7cc6 (patch) | |
| tree | df65d9f00fc41569931e58b9d0778c329f825d3c | |
| parent | 1773232eec49a9d2dabfa505d009144ce938670f (diff) | |
| parent | 6bdd326e740fb87a88a49189925ca12a02311c8b (diff) | |
Merge branch 'pm-devfreq'
* pm-devfreq:
PM / devfreq: Remove duplicate include of opp.h
| -rw-r--r-- | drivers/devfreq/exynos/exynos5_bus.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/devfreq/exynos/exynos5_bus.c b/drivers/devfreq/exynos/exynos5_bus.c index 574b16b59be5..93c29f4085bd 100644 --- a/drivers/devfreq/exynos/exynos5_bus.c +++ b/drivers/devfreq/exynos/exynos5_bus.c | |||
| @@ -18,7 +18,6 @@ | |||
| 18 | #include <linux/opp.h> | 18 | #include <linux/opp.h> |
| 19 | #include <linux/slab.h> | 19 | #include <linux/slab.h> |
| 20 | #include <linux/suspend.h> | 20 | #include <linux/suspend.h> |
| 21 | #include <linux/opp.h> | ||
| 22 | #include <linux/clk.h> | 21 | #include <linux/clk.h> |
| 23 | #include <linux/delay.h> | 22 | #include <linux/delay.h> |
| 24 | #include <linux/platform_device.h> | 23 | #include <linux/platform_device.h> |