From 8f0902c64df8e4210371ebbef9ce19c2d39b2ce3 Mon Sep 17 00:00:00 2001
From: JoonSoo Kim <js1304@gmail.com>
Date: Mon, 12 Nov 2012 06:40:33 +0000
Subject: [PATCH] --- yaml --- r: 346801 b: refs/heads/master c:
 03737439d83f4214b98a391f5ef9709b8d15af02 h: refs/heads/master i:   346799:
 4ea4ea07ffe80a17fae27b15d309f91a1a4466f9 v: v3

---
 [refs]                                             | 2 +-
 trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 3d683eaaa3c4..ac9d1632fce5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a53fd61ac2f411745471c1c877d5e072fbbf0e5c
+refs/heads/master: 03737439d83f4214b98a391f5ef9709b8d15af02
diff --git a/trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c b/trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
index 328d221fd1c0..74861a7fb807 100644
--- a/trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
+++ b/trunk/arch/powerpc/platforms/82xx/pq2ads-pci-pic.c
@@ -16,7 +16,6 @@
 #include <linux/spinlock.h>
 #include <linux/irq.h>
 #include <linux/types.h>
-#include <linux/bootmem.h>
 #include <linux/slab.h>
 
 #include <asm/io.h>
@@ -149,7 +148,7 @@ int __init pq2ads_pci_init_irq(void)
 	priv->regs = of_iomap(np, 0);
 	if (!priv->regs) {
 		printk(KERN_ERR "Cannot map PCI PIC registers.\n");
-		goto out_free_bootmem;
+		goto out_free_kmalloc;
 	}
 
 	/* mask all PCI interrupts */
@@ -171,9 +170,8 @@ int __init pq2ads_pci_init_irq(void)
 
 out_unmap_regs:
 	iounmap(priv->regs);
-out_free_bootmem:
-	free_bootmem((unsigned long)priv,
-	             sizeof(struct pq2ads_pci_pic));
+out_free_kmalloc:
+	kfree(priv);
 	of_node_put(np);
 out_unmap_irq:
 	irq_dispose_mapping(irq);