Index: linux-2.6/arch/powerpc/kernel/dma_64.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/dma_64.c
+++ linux-2.6/arch/powerpc/kernel/dma_64.c
@@ -31,15 +31,15 @@ static inline unsigned long device_to_ma
 static void *dma_iommu_alloc_coherent(struct device *dev, size_t size,
 				      dma_addr_t *dma_handle, gfp_t flag)
 {
-	return iommu_alloc_coherent(dev->sysdata.dma_data, size, dma_handle,
+	return iommu_alloc_coherent(dev->archdata.dma_data, size, dma_handle,
 				    device_to_mask(dev), flag,
-				    dev->sysdata.numa_node);
+				    dev->archdata.numa_node);
 }
 
 static void dma_iommu_free_coherent(struct device *dev, size_t size,
 				    void *vaddr, dma_addr_t dma_handle)
 {
-	iommu_free_coherent(dev->sysdata.dma_data, size, vaddr, dma_handle);
+	iommu_free_coherent(dev->archdata.dma_data, size, vaddr, dma_handle);
 }
 
 /* Creates TCEs for a user provided buffer.  The user buffer must be
@@ -52,7 +52,7 @@ static dma_addr_t dma_iommu_map_single(s
 				       size_t size,
 				       enum dma_data_direction direction)
 {
-	return iommu_map_single(dev->sysdata.dma_data, vaddr, size,
+	return iommu_map_single(dev->archdata.dma_data, vaddr, size,
 			        device_to_mask(dev), direction);
 }
 
@@ -61,27 +61,27 @@ static void dma_iommu_unmap_single(struc
 				   size_t size,
 				   enum dma_data_direction direction)
 {
-	iommu_unmap_single(dev->sysdata.dma_data, dma_handle, size, direction);
+	iommu_unmap_single(dev->archdata.dma_data, dma_handle, size, direction);
 }
 
 
 static int dma_iommu_map_sg(struct device *dev, struct scatterlist *sglist,
 			    int nelems, enum dma_data_direction direction)
 {
-	return iommu_map_sg(dev->sysdata.dma_data, sglist, nelems,
+	return iommu_map_sg(dev->archdata.dma_data, sglist, nelems,
 			    device_to_mask(dev), direction);
 }
 
 static void dma_iommu_unmap_sg(struct device *dev, struct scatterlist *sglist,
 		int nelems, enum dma_data_direction direction)
 {
-	iommu_unmap_sg(dev->sysdata.dma_data, sglist, nelems, direction);
+	iommu_unmap_sg(dev->archdata.dma_data, sglist, nelems, direction);
 }
 
 /* We support DMA to/from any memory page via the iommu */
 static int dma_iommu_dma_supported(struct device *dev, u64 mask)
 {
-	struct iommu_table *tbl = dev->sysdata.dma_data;
+	struct iommu_table *tbl = dev->archdata.dma_data;
 
 	if (!tbl || tbl->it_offset > mask) {
 		printk(KERN_INFO
@@ -122,7 +122,7 @@ static void *dma_direct_alloc_coherent(s
 {
 	struct page *page;
 	void *ret;
-	int node = dev->sysdata.numa_node;
+	int node = dev->archdata.numa_node;
 
 	/* TODO: Maybe use the numa node here too ? */
 	page = alloc_pages_node(node, flag, get_order(size));
Index: linux-2.6/arch/powerpc/kernel/ibmebus.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/ibmebus.c
+++ linux-2.6/arch/powerpc/kernel/ibmebus.c
@@ -176,9 +176,9 @@ static struct ibmebus_dev* __devinit ibm
 	dev->ofdev.dev.bus     = &ibmebus_bus_type;
 	dev->ofdev.dev.release = ibmebus_dev_release;
 
-	dev->ofdev.dev.sysdata.of_node = dev->ofdev.node;
-	dev->ofdev.dev.sysdata.dma_ops = &ibmebus_dma_ops;
-	dev->ofdev.dev.sysdata.numa_node = of_node_to_nid(dev->ofdev.node);
+	dev->ofdev.dev.archdata.of_node = dev->ofdev.node;
+	dev->ofdev.dev.archdata.dma_ops = &ibmebus_dma_ops;
+	dev->ofdev.dev.archdata.numa_node = of_node_to_nid(dev->ofdev.node);
 
 	/* An ibmebusdev is based on a of_device. We have to change the
 	 * bus type to use our own DMA mapping operations. 
Index: linux-2.6/arch/powerpc/kernel/of_platform.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/of_platform.c
+++ linux-2.6/arch/powerpc/kernel/of_platform.c
@@ -225,8 +225,8 @@ struct of_device* of_platform_device_cre
 	dev->dev.parent = parent;
 	dev->dev.bus = &of_platform_bus_type;
 	dev->dev.release = of_release_dev;
-	dev->dev.sysdata.of_node = np;
-	dev->dev.sysdata.numa_node = of_node_to_nid(np);
+	dev->dev.archdata.of_node = np;
+	dev->dev.archdata.numa_node = of_node_to_nid(np);
 
 	/* We do not fill the DMA ops for platform devices by default.
 	 * This is currently the responsibility of the platform code
Index: linux-2.6/arch/powerpc/kernel/pci_64.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/pci_64.c
+++ linux-2.6/arch/powerpc/kernel/pci_64.c
@@ -1215,7 +1215,7 @@ EXPORT_SYMBOL(pcibios_fixup_device_resou
 
 void __devinit pcibios_setup_new_device(struct pci_dev *dev)
 {
-	struct dev_sysdata *sd = &dev->dev.sysdata;
+	struct dev_archdata *sd = &dev->dev.archdata;
 
 	sd->of_node = pci_device_to_OF_node(dev);
 
Index: linux-2.6/arch/powerpc/kernel/vio.c
===================================================================
--- linux-2.6.orig/arch/powerpc/kernel/vio.c
+++ linux-2.6/arch/powerpc/kernel/vio.c
@@ -81,14 +81,14 @@ static struct iommu_table *vio_build_iom
 		struct iommu_table *tbl;
 		unsigned long offset, size;
 
-		dma_window = get_property(dev->dev.sysdata.of_node,
+		dma_window = get_property(dev->dev.archdata.of_node,
 					  "ibm,my-dma-window", NULL);
 		if (!dma_window)
 			return NULL;
 
 		tbl = kmalloc(sizeof(*tbl), GFP_KERNEL);
 
-		of_parse_dma_window(dev->dev.sysdata.of_node, dma_window,
+		of_parse_dma_window(dev->dev.archdata.of_node, dma_window,
 				    &tbl->it_index, &offset, &size);
 
 		/* TCE table size - measured in tce entries */
@@ -117,7 +117,7 @@ static const struct vio_device_id *vio_m
 {
 	while (ids->type[0] != '\0') {
 		if ((strncmp(dev->type, ids->type, strlen(ids->type)) == 0) &&
-		    device_is_compatible(dev->dev.sysdata.of_node,
+		    device_is_compatible(dev->dev.archdata.of_node,
 					 ids->compat))
 			return ids;
 		ids++;
@@ -199,9 +199,9 @@ EXPORT_SYMBOL(vio_unregister_driver);
 /* vio_dev refcount hit 0 */
 static void __devinit vio_dev_release(struct device *dev)
 {
-	if (dev->sysdata.of_node) {
+	if (dev->archdata.of_node) {
 		/* XXX should free TCE table */
-		of_node_put(dev->sysdata.of_node);
+		of_node_put(dev->archdata.of_node);
 	}
 	kfree(to_vio_dev(dev));
 }
@@ -253,10 +253,10 @@ struct vio_dev * __devinit vio_register_
 		if (unit_address != NULL)
 			viodev->unit_address = *unit_address;
 	}
-	viodev->dev.sysdata.of_node = of_node_get(of_node);
-	viodev->dev.sysdata.dma_ops = &dma_iommu_ops;
-	viodev->dev.sysdata.dma_data = vio_build_iommu_table(viodev);
-	viodev->dev.sysdata.numa_node = of_node_to_nid(of_node);
+	viodev->dev.archdata.of_node = of_node_get(of_node);
+	viodev->dev.archdata.dma_ops = &dma_iommu_ops;
+	viodev->dev.archdata.dma_data = vio_build_iommu_table(viodev);
+	viodev->dev.archdata.numa_node = of_node_to_nid(of_node);
 
 	/* init generic 'struct device' fields: */
 	viodev->dev.parent = &vio_bus_device.dev;
@@ -287,8 +287,8 @@ static int __init vio_bus_init(void)
 #ifdef CONFIG_PPC_ISERIES
 	if (firmware_has_feature(FW_FEATURE_ISERIES)) {
 		iommu_vio_init();
-		vio_bus_device.dev.sysdata.dma_ops = &dma_iommu_ops;
-		vio_bus_device.dev.sysdata.dma_data = &vio_iommu_table;
+		vio_bus_device.dev.archdata.dma_ops = &dma_iommu_ops;
+		vio_bus_device.dev.archdata.dma_data = &vio_iommu_table;
 		iSeries_vio_dev = &vio_bus_device.dev;
 	}
 #endif /* CONFIG_PPC_ISERIES */
@@ -339,7 +339,7 @@ static ssize_t name_show(struct device *
 static ssize_t devspec_show(struct device *dev,
 		struct device_attribute *attr, char *buf)
 {
-	struct device_node *of_node = dev->sysdata.of_node;
+	struct device_node *of_node = dev->archdata.of_node;
 
 	return sprintf(buf, "%s\n", of_node ? of_node->full_name : "none");
 }
@@ -376,7 +376,7 @@ static int vio_hotplug(struct device *de
 	if (!num_envp)
 		return -ENOMEM;
 
-	dn = dev->sysdata.of_node;
+	dn = dev->archdata.of_node;
 	if (!dn)
 		return -ENODEV;
 	cp = get_property(dn, "compatible", &length);
@@ -413,7 +413,7 @@ struct bus_type vio_bus_type = {
 */
 const void *vio_get_attribute(struct vio_dev *vdev, char *which, int *length)
 {
-	return get_property(vdev->dev.sysdata.of_node, which, length);
+	return get_property(vdev->dev.archdata.of_node, which, length);
 }
 EXPORT_SYMBOL(vio_get_attribute);
 
Index: linux-2.6/arch/powerpc/platforms/cell/iommu.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/cell/iommu.c
+++ linux-2.6/arch/powerpc/platforms/cell/iommu.c
@@ -492,7 +492,7 @@ static void cell_dma_dev_setup(struct de
 {
 	struct iommu_window *window;
 	struct cbe_iommu *iommu;
-	struct dev_sysdata *sysdata = &dev->sysdata;
+	struct dev_archdata *archdata = &dev->archdata;
 
 	/* If we run without iommu, no need to do anything */
 	if (pci_dma_ops == &dma_direct_ops)
@@ -502,16 +502,16 @@ static void cell_dma_dev_setup(struct de
 	 * node's iommu. We -might- do something smarter later though it may
 	 * never be necessary
 	 */
-	iommu = cell_iommu_for_node(sysdata->numa_node);
+	iommu = cell_iommu_for_node(archdata->numa_node);
 	if (iommu == NULL || list_empty(&iommu->windows)) {
 		printk(KERN_ERR "iommu: missing iommu for %s (node %d)\n",
-		       sysdata->of_node ? sysdata->of_node->full_name : "?",
-		       sysdata->numa_node);
+		       archdata->of_node ? archdata->of_node->full_name : "?",
+		       archdata->numa_node);
 		return;
 	}
 	window = list_entry(iommu->windows.next, struct iommu_window, list);
 
-	sysdata->dma_data = &window->table;
+	archdata->dma_data = &window->table;
 }
 
 static void cell_pci_dma_dev_setup(struct pci_dev *dev)
@@ -529,7 +529,7 @@ static int cell_of_bus_notify(struct not
 		return 0;
 
 	/* We use the PCI DMA ops */
-	dev->sysdata.dma_ops = pci_dma_ops;
+	dev->archdata.dma_ops = pci_dma_ops;
 
 	cell_dma_dev_setup(dev);
 
Index: linux-2.6/arch/powerpc/platforms/iseries/iommu.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/iseries/iommu.c
+++ linux-2.6/arch/powerpc/platforms/iseries/iommu.c
@@ -187,7 +187,7 @@ void iommu_devnode_init_iSeries(struct p
 		pdn->iommu_table = iommu_init_table(tbl, -1);
 	else
 		kfree(tbl);
-	pdev->dev.sysdata.dma_data = pdn->iommu_table;
+	pdev->dev.archdata.dma_data = pdn->iommu_table;
 }
 #endif
 
Index: linux-2.6/arch/powerpc/platforms/pseries/iommu.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/pseries/iommu.c
+++ linux-2.6/arch/powerpc/platforms/pseries/iommu.c
@@ -446,7 +446,7 @@ static void pci_dma_dev_setup_pSeries(st
 
 	DBG("pci_dma_dev_setup_pSeries: %s\n", pci_name(dev));
 
-	dn = dev->dev.sysdata.of_node;
+	dn = dev->dev.archdata.of_node;
 
 	/* If we're the direct child of a root bus, then we need to allocate
 	 * an iommu table ourselves. The bus setup code should have setup
@@ -459,7 +459,7 @@ static void pci_dma_dev_setup_pSeries(st
 		tbl = kmalloc_node(sizeof(struct iommu_table), GFP_KERNEL,
 				   phb->node);
 		iommu_table_setparms(phb, dn, tbl);
-		dev->dev.sysdata.dma_data = iommu_init_table(tbl, phb->node);
+		dev->dev.archdata.dma_data = iommu_init_table(tbl, phb->node);
 		return;
 	}
 
@@ -471,7 +471,7 @@ static void pci_dma_dev_setup_pSeries(st
 		dn = dn->parent;
 
 	if (dn && PCI_DN(dn))
-		dev->dev.sysdata.dma_data = PCI_DN(dn)->iommu_table;
+		dev->dev.archdata.dma_data = PCI_DN(dn)->iommu_table;
 	else
 		printk(KERN_WARNING "iommu: Device %s has no iommu table\n",
 		       pci_name(dev));
@@ -532,7 +532,7 @@ static void pci_dma_dev_setup_pSeriesLP(
 	 */
 	if (dma_window == NULL || pdn->parent == NULL) {
 		DBG("  no dma window for device, linking to parent\n");
-		dev->dev.sysdata.dma_data = PCI_DN(pdn)->iommu_table;
+		dev->dev.archdata.dma_data = PCI_DN(pdn)->iommu_table;
 		return;
 	}
 	DBG("  found DMA window, table: %p\n", pci->iommu_table);
@@ -551,7 +551,7 @@ static void pci_dma_dev_setup_pSeriesLP(
 		DBG("  created table: %p\n", pci->iommu_table);
 	}
 
-	dev->dev.sysdata.dma_data = pci->iommu_table;
+	dev->dev.archdata.dma_data = pci->iommu_table;
 }
 
 /* These are called very early. */
Index: linux-2.6/arch/powerpc/platforms/pseries/pci_dlpar.c
===================================================================
--- linux-2.6.orig/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ linux-2.6/arch/powerpc/platforms/pseries/pci_dlpar.c
@@ -93,7 +93,7 @@ pcibios_fixup_new_pci_devices(struct pci
 		if (list_empty(&dev->global_list)) {
 			int i;
 
-			/* Fill device sysdata and setup iommu table */
+			/* Fill device archdata and setup iommu table */
 			pcibios_setup_new_device(dev);
 
 			if(fix_bus)
Index: linux-2.6/arch/powerpc/sysdev/dart_iommu.c
===================================================================
--- linux-2.6.orig/arch/powerpc/sysdev/dart_iommu.c
+++ linux-2.6/arch/powerpc/sysdev/dart_iommu.c
@@ -291,7 +291,7 @@ static void pci_dma_dev_setup_dart(struc
 	/* We only have one iommu table on the mac for now, which makes
 	 * things simple. Setup all PCI devices to point to this table
 	 */
-	dev->dev.sysdata.dma_data = &iommu_table_dart;
+	dev->dev.archdata.dma_data = &iommu_table_dart;
 }
 
 static void pci_dma_bus_setup_dart(struct pci_bus *bus)
Index: linux-2.6/drivers/acpi/glue.c
===================================================================
--- linux-2.6.orig/drivers/acpi/glue.c
+++ linux-2.6/drivers/acpi/glue.c
@@ -267,7 +267,7 @@ static int acpi_bind_one(struct device *
 {
 	acpi_status status;
 
-	if (dev->sysdata.acpi_handle) {
+	if (dev->archdata.acpi_handle) {
 		printk(KERN_WARNING PREFIX
 		       "Drivers changed 'acpi_handle' for %s\n", dev->bus_id);
 		return -EINVAL;
@@ -278,21 +278,21 @@ static int acpi_bind_one(struct device *
 		put_device(dev);
 		return -EINVAL;
 	}
-	dev->sysdata.acpi_handle = handle;
+	dev->archdata.acpi_handle = handle;
 
 	return 0;
 }
 
 static int acpi_unbind_one(struct device *dev)
 {
-	if (!dev->sysdata.acpi_handle)
+	if (!dev->archdata.acpi_handle)
 		return 0;
-	if (dev == acpi_get_physical_device(dev->sysdata.acpi_handle)) {
+	if (dev == acpi_get_physical_device(dev->archdata.acpi_handle)) {
 		/* acpi_get_physical_device increase refcnt by one */
 		put_device(dev);
-		acpi_detach_data(dev->sysdata.acpi_handle,
+		acpi_detach_data(dev->archdata.acpi_handle,
 				 acpi_glue_data_handler);
-		dev->sysdata.acpi_handle = NULL;
+		dev->archdata.acpi_handle = NULL;
 		/* acpi_bind_one increase refcnt by one */
 		put_device(dev);
 	} else {
@@ -329,7 +329,7 @@ static int acpi_platform_notify(struct d
 	if (!ret) {
 		struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
 
-		acpi_get_name(dev->sysdata.acpi_handle,
+		acpi_get_name(dev->archdata.acpi_handle,
 			      ACPI_FULL_PATHNAME, &buffer);
 		DBG("Device %s -> %s\n", dev->bus_id, (char *)buffer.pointer);
 		kfree(buffer.pointer);
Index: linux-2.6/include/acpi/acpi_bus.h
===================================================================
--- linux-2.6.orig/include/acpi/acpi_bus.h
+++ linux-2.6/include/acpi/acpi_bus.h
@@ -357,7 +357,7 @@ struct device *acpi_get_physical_device(
 /* helper */
 acpi_handle acpi_get_child(acpi_handle, acpi_integer);
 acpi_handle acpi_get_pci_rootbridge_handle(unsigned int, unsigned int);
-#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->sysdata.acpi_handle))
+#define DEVICE_ACPI_HANDLE(dev) ((acpi_handle)((dev)->archdata.acpi_handle))
 
 #endif /* CONFIG_ACPI */
 
Index: linux-2.6/include/asm-alpha/device.h
===================================================================
--- linux-2.6.orig/include/asm-alpha/device.h
+++ linux-2.6/include/asm-alpha/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-arm/device.h
===================================================================
--- linux-2.6.orig/include/asm-arm/device.h
+++ linux-2.6/include/asm-arm/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-arm26/device.h
===================================================================
--- linux-2.6.orig/include/asm-arm26/device.h
+++ linux-2.6/include/asm-arm26/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-avr32/device.h
===================================================================
--- linux-2.6.orig/include/asm-avr32/device.h
+++ linux-2.6/include/asm-avr32/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-cris/device.h
===================================================================
--- linux-2.6.orig/include/asm-cris/device.h
+++ linux-2.6/include/asm-cris/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-frv/device.h
===================================================================
--- linux-2.6.orig/include/asm-frv/device.h
+++ linux-2.6/include/asm-frv/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-generic/device.h
===================================================================
--- linux-2.6.orig/include/asm-generic/device.h
+++ linux-2.6/include/asm-generic/device.h
@@ -2,13 +2,11 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
+#ifndef _ASM_GENERIC_DEVICE_H
+#define _ASM_GENERIC_DEVICE_H
 
-struct dev_sysdata {
+struct dev_archdata {
 };
 
-#endif /* _ASM_DEVICE_H */
+#endif /* _ASM_GENERIC_DEVICE_H */
Index: linux-2.6/include/asm-h8300/device.h
===================================================================
--- linux-2.6.orig/include/asm-h8300/device.h
+++ linux-2.6/include/asm-h8300/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-i386/device.h
===================================================================
--- linux-2.6.orig/include/asm-i386/device.h
+++ linux-2.6/include/asm-i386/device.h
@@ -2,16 +2,14 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
+#ifndef _ASM_I386_DEVICE_H
+#define _ASM_I386_DEVICE_H
 
-struct dev_sysdata {
+struct dev_archdata {
 #ifdef CONFIG_ACPI
 	void	*acpi_handle;
 #endif
 };
 
-#endif /* _ASM_DEVICE_H */
+#endif /* _ASM_I386_DEVICE_H */
Index: linux-2.6/include/asm-ia64/device.h
===================================================================
--- linux-2.6.orig/include/asm-ia64/device.h
+++ linux-2.6/include/asm-ia64/device.h
@@ -2,16 +2,14 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
+#ifndef _ASM_IA64_DEVICE_H
+#define _ASM_IA64_DEVICE_H
 
-struct dev_sysdata {
+struct dev_archdata {
 #ifdef CONFIG_ACPI
 	void	*acpi_handle;
 #endif
 };
 
-#endif /* _ASM_DEVICE_H */
+#endif /* _ASM_IA64_DEVICE_H */
Index: linux-2.6/include/asm-m32r/device.h
===================================================================
--- linux-2.6.orig/include/asm-m32r/device.h
+++ linux-2.6/include/asm-m32r/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-m68k/device.h
===================================================================
--- linux-2.6.orig/include/asm-m68k/device.h
+++ linux-2.6/include/asm-m68k/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-m68knommu/device.h
===================================================================
--- linux-2.6.orig/include/asm-m68knommu/device.h
+++ linux-2.6/include/asm-m68knommu/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-mips/device.h
===================================================================
--- linux-2.6.orig/include/asm-mips/device.h
+++ linux-2.6/include/asm-mips/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-parisc/device.h
===================================================================
--- linux-2.6.orig/include/asm-parisc/device.h
+++ linux-2.6/include/asm-parisc/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-powerpc/device.h
===================================================================
--- linux-2.6.orig/include/asm-powerpc/device.h
+++ linux-2.6/include/asm-powerpc/device.h
@@ -2,16 +2,14 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
+#ifndef _ASM_POWERPC_DEVICE_H
+#define _ASM_POWERPC_DEVICE_H
 
 struct dma_mapping_ops;
 struct device_node;
 
-struct dev_sysdata {
+struct dev_archdata {
 	/* Optional pointer to an OF device node */
 	struct device_node	*of_node;
 
@@ -23,4 +21,4 @@ struct dev_sysdata {
 	int			numa_node;
 };
 
-#endif /* _ASM_DEVICE_H */
+#endif /* _ASM_POWERPC_DEVICE_H */
Index: linux-2.6/include/asm-powerpc/dma-mapping.h
===================================================================
--- linux-2.6.orig/include/asm-powerpc/dma-mapping.h
+++ linux-2.6/include/asm-powerpc/dma-mapping.h
@@ -72,9 +72,9 @@ static inline struct dma_mapping_ops *ge
 	 * only ISA DMA device we support is the floppy and we have a hack
 	 * in the floppy driver directly to get a device for us.
 	 */
-	if (unlikely(dev == NULL || dev->sysdata.dma_ops == NULL))
+	if (unlikely(dev == NULL || dev->archdata.dma_ops == NULL))
 		return NULL;
-	return dev->sysdata.dma_ops;
+	return dev->archdata.dma_ops;
 }
 
 static inline int dma_supported(struct device *dev, u64 mask)
Index: linux-2.6/include/asm-ppc/device.h
===================================================================
--- linux-2.6.orig/include/asm-ppc/device.h
+++ linux-2.6/include/asm-ppc/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-s390/device.h
===================================================================
--- linux-2.6.orig/include/asm-s390/device.h
+++ linux-2.6/include/asm-s390/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-sh/device.h
===================================================================
--- linux-2.6.orig/include/asm-sh/device.h
+++ linux-2.6/include/asm-sh/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-sh64/device.h
===================================================================
--- linux-2.6.orig/include/asm-sh64/device.h
+++ linux-2.6/include/asm-sh64/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-sparc/device.h
===================================================================
--- linux-2.6.orig/include/asm-sparc/device.h
+++ linux-2.6/include/asm-sparc/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-sparc64/device.h
===================================================================
--- linux-2.6.orig/include/asm-sparc64/device.h
+++ linux-2.6/include/asm-sparc64/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-um/device.h
===================================================================
--- linux-2.6.orig/include/asm-um/device.h
+++ linux-2.6/include/asm-um/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-v850/device.h
===================================================================
--- linux-2.6.orig/include/asm-v850/device.h
+++ linux-2.6/include/asm-v850/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/asm-x86_64/device.h
===================================================================
--- linux-2.6.orig/include/asm-x86_64/device.h
+++ linux-2.6/include/asm-x86_64/device.h
@@ -2,16 +2,14 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
+#ifndef _ASM_X86_64_DEVICE_H
+#define _ASM_X86_64_DEVICE_H
 
-struct dev_sysdata {
+struct dev_archdata {
 #ifdef CONFIG_ACPI
 	void	*acpi_handle;
 #endif
 };
 
-#endif /* _ASM_DEVICE_H */
+#endif /* _ASM_X86_64_DEVICE_H */
Index: linux-2.6/include/asm-xtensa/device.h
===================================================================
--- linux-2.6.orig/include/asm-xtensa/device.h
+++ linux-2.6/include/asm-xtensa/device.h
@@ -2,13 +2,6 @@
  * Arch specific extensions to struct device
  *
  * This file is released under the GPLv2
- *
- * See Documentation/driver-model/ for more information.
  */
-#ifndef _ASM_DEVICE_H
-#define _ASM_DEVICE_H
-
-struct dev_sysdata {
-};
+#include <asm-generic/device.h>
 
-#endif /* _ASM_DEVICE_H */
Index: linux-2.6/include/linux/device.h
===================================================================
--- linux-2.6.orig/include/linux/device.h
+++ linux-2.6/include/linux/device.h
@@ -357,7 +357,7 @@ struct device {
 	struct dma_coherent_mem	*dma_mem; /* internal for coherent mem
 					     override */
 	/* arch specific additions */
-	struct dev_sysdata	sysdata;
+	struct dev_archdata	archdata;
 
 	/* class_device migration path */
 	struct list_head	node;