ACPI: Move sysfs definitions from scan.c to acpi_bus.h

Signed-off-by: Brandon Philips <brandon@ifup.org>
---
 drivers/acpi/scan.c     |    9 ---------
 include/acpi/acpi_bus.h |   10 ++++++++++
 2 files changed, 10 insertions(+), 9 deletions(-)

Index: linux-2.6-rc/drivers/acpi/scan.c
===================================================================
--- linux-2.6-rc.orig/drivers/acpi/scan.c
+++ linux-2.6-rc/drivers/acpi/scan.c
@@ -32,11 +32,6 @@ static void acpi_device_release(struct k
 	kfree(dev);
 }
 
-struct acpi_device_attribute {
-	struct attribute attr;
-	 ssize_t(*show) (struct acpi_device *, char *);
-	 ssize_t(*store) (struct acpi_device *, const char *, size_t);
-};
 
 typedef void acpi_device_sysfs_files(struct kobject *,
 				     const struct attribute *);
@@ -344,10 +339,6 @@ static int acpi_bus_get_wakeup_device_fl
 static ssize_t acpi_eject_store(struct acpi_device *device,
 				const char *buf, size_t count);
 
-#define ACPI_DEVICE_ATTR(_name,_mode,_show,_store) \
-static struct acpi_device_attribute acpi_device_attr_##_name = \
-		__ATTR(_name, _mode, _show, _store)
-
 ACPI_DEVICE_ATTR(eject, 0200, NULL, acpi_eject_store);
 
 /**
Index: linux-2.6-rc/include/acpi/acpi_bus.h
===================================================================
--- linux-2.6-rc.orig/include/acpi/acpi_bus.h
+++ linux-2.6-rc/include/acpi/acpi_bus.h
@@ -182,6 +182,16 @@ struct acpi_device_dir {
 
 #define acpi_device_dir(d)	((d)->dir.entry)
 
+#define ACPI_DEVICE_ATTR(_name,_mode,_show,_store) \
+static struct acpi_device_attribute acpi_device_attr_##_name = \
+		__ATTR(_name, _mode, _show, _store)
+
+struct acpi_device_attribute {
+	struct attribute attr;
+	 ssize_t(*show) (struct acpi_device *, char *);
+	 ssize_t(*store) (struct acpi_device *, const char *, size_t);
+};
+
 /* Plug and Play */
 
 typedef char acpi_bus_id[5];