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

[linux-2.6-omap-h63xx.git] / kernel / irq / devres.c

diff --git a/kernel/irq/devres.c b/kernel/irq/devres.c
index 85a430da0fb63fb02c9e82e77910401d8d2adeac..38a25b8d8bff6d15448270d4f56983537335fc2d 100644 (file)
--- a/kernel/irq/devres.c
+++ b/kernel/irq/devres.c
@@ -1,5 +1,7 @@
 #include <linux/module.h>
 #include <linux/interrupt.h>
+#include <linux/device.h>
+#include <linux/gfp.h>
 
 /*
  * Device resource management aware IRQ request/free implementation.
@@ -54,7 +56,7 @@ int devm_request_irq(struct device *dev, unsigned int irq,
 
        rc = request_irq(irq, handler, irqflags, devname, dev_id);
        if (rc) {
-               kfree(dr);
+               devres_free(dr);
                return rc;
        }