Fix 3.3 merge error in: drivers: power: Add watchdog timer to catch drivers which...
[linux-2.6.git] / drivers / base / power / common.c
index d398cf0..a14085c 100644 (file)
@@ -8,10 +8,10 @@
 
 #include <linux/init.h>
 #include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/slab.h>
 #include <linux/device.h>
-#include <linux/pm_runtime.h>
+#include <linux/export.h>
+#include <linux/slab.h>
+#include <linux/pm_clock.h>
 
 /**
  * dev_pm_get_subsys_data - Create or refcount power.subsys_data for device.