3 files changed, 19 insertions, 45 deletions

diff --git a/drivers/base/core.c b/drivers/base/core.c
index d2de2d59af42..b3a931fe6b16 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1415,5 +1415,23 @@ out:
         put_device(dev);
         return error;
 }
-
 EXPORT_SYMBOL_GPL(device_move);
+
+/**
+ * device_shutdown - call ->shutdown() on each device to shutdown.
+ */
+void device_shutdown(void)
+{
+        struct device * dev, *devn;
+
+        list_for_each_entry_safe_reverse(dev, devn, &devices_kset->list,
+                                kobj.entry) {
+                if (dev->bus && dev->bus->shutdown) {
+                        dev_dbg(dev, "shutdown\n");
+                        dev->bus->shutdown(dev);
+                } else if (dev->driver && dev->driver->shutdown) {
+                        dev_dbg(dev, "shutdown\n");
+                        dev->driver->shutdown(dev);
+                }
+        }
+}
diff --git a/drivers/base/power/Makefile b/drivers/base/power/Makefile
index 44504e6618fb..06a86fe6a78d 100644
--- a/drivers/base/power/Makefile
+++ b/drivers/base/power/Makefile
@@ -1,4 +1,3 @@
-obj-y                   := shutdown.o
 obj-$(CONFIG_PM)        += sysfs.o
 obj-$(CONFIG_PM_SLEEP)  += main.o
 obj-$(CONFIG_PM_TRACE)  += trace.o
diff --git a/drivers/base/power/shutdown.c b/drivers/base/power/shutdown.c
deleted file mode 100644
index 5b6bc168ffba..000000000000
--- a/drivers/base/power/shutdown.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * shutdown.c - power management functions for the device tree.
- *
- * Copyright (c) 2002-3 Patrick Mochel
- *               2002-3 Open Source Development Lab
- *
- * This file is released under the GPLv2
- *
- */
-
-#include <linux/device.h>
-#include <asm/semaphore.h>
-
-#include "../base.h"
-
-/**
- * We handle system devices differently - we suspend and shut them
- * down last and resume them first. That way, we don't do anything stupid like
- * shutting down the interrupt controller before any devices..
- *
- * Note that there are not different stages for power management calls -
- * they only get one called once when interrupts are disabled.
- */
-
-
-/**
- * device_shutdown - call ->shutdown() on each device to shutdown.
- */
-void device_shutdown(void)
-{
-        struct device * dev, *devn;
-
-        list_for_each_entry_safe_reverse(dev, devn, &devices_kset->list,
-                                kobj.entry) {
-                if (dev->bus && dev->bus->shutdown) {
-                        dev_dbg(dev, "shutdown\n");
-                        dev->bus->shutdown(dev);
-                } else if (dev->driver && dev->driver->shutdown) {
-                        dev_dbg(dev, "shutdown\n");
-                        dev->driver->shutdown(dev);
-                }
-        }
-}