Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / ibmebus.c

diff --git a/arch/powerpc/kernel/ibmebus.c b/arch/powerpc/kernel/ibmebus.c
index 64299d28f36485d3441e0b59604228e141712cb1..6e3f62493659abc79e68f6795f14dd3d52d8cab1 100644 (file)
--- a/arch/powerpc/kernel/ibmebus.c
+++ b/arch/powerpc/kernel/ibmebus.c
@@ -47,7 +47,7 @@
 #include <asm/abs_addr.h>
 
 static struct device ibmebus_bus_device = { /* fake "parent" device */
-       .bus_id = "ibmebus",
+       .init_name = "ibmebus",
 };
 
 struct bus_type ibmebus_bus_type;
@@ -231,6 +231,7 @@ void ibmebus_free_irq(u32 ist, void *dev_id)
        unsigned int irq = irq_find_mapping(NULL, ist);
 
        free_irq(irq, dev_id);
+       irq_dispose_mapping(irq);
 }
 EXPORT_SYMBOL(ibmebus_free_irq);