Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/voltage-2.6

[safe/jmp/linux-2.6] / drivers / base / isa.c

diff --git a/drivers/base/isa.c b/drivers/base/isa.c
index d222239..91dba65 100644 (file)
--- a/drivers/base/isa.c
+++ b/drivers/base/isa.c
@@ -7,10 +7,11 @@
 #include <linux/slab.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/dma-mapping.h>
 #include <linux/isa.h>
 
 static struct device isa_bus = {
-       .bus_id         = "isa"
+       .init_name      = "isa"
 };
 
 struct isa_dev {
@@ -134,13 +135,15 @@ int isa_register_driver(struct isa_driver *isa_driver, unsigned int ndev)
                isa_dev->dev.parent     = &isa_bus;
                isa_dev->dev.bus        = &isa_bus_type;
 
-               snprintf(isa_dev->dev.bus_id, BUS_ID_SIZE, "%s.%u",
-                               isa_driver->driver.name, id);
-
+               dev_set_name(&isa_dev->dev, "%s.%u",
+                            isa_driver->driver.name, id);
                isa_dev->dev.platform_data      = isa_driver;
                isa_dev->dev.release            = isa_dev_release;
                isa_dev->id                     = id;
 
+               isa_dev->dev.coherent_dma_mask = DMA_BIT_MASK(24);
+               isa_dev->dev.dma_mask = &isa_dev->dev.coherent_dma_mask;
+
                error = device_register(&isa_dev->dev);
                if (error) {
                        put_device(&isa_dev->dev);