From 8185c25fd1f0ec25f95f90faebf00c93cbe4e1ca Mon Sep 17 00:00:00 2001
From: Mathieu Desnoyers <mathieu.desnoyers@polymtl.ca>
Date: Mon, 9 Jul 2007 11:37:34 -0700
Subject: [PATCH] --- yaml --- r: 60702 b: refs/heads/master c:
 1f945a86a8250b66fda47cf1fc8f3daf5d0f8969 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/powerpc/kernel/prom.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 78796caa6c41..c362db6daa7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8203c17e5b35408889ec5c358d71110b624519bd
+refs/heads/master: 1f945a86a8250b66fda47cf1fc8f3daf5d0f8969
diff --git a/trunk/arch/powerpc/kernel/prom.c b/trunk/arch/powerpc/kernel/prom.c
index 0782afc29f5f..37ff99bd98b4 100644
--- a/trunk/arch/powerpc/kernel/prom.c
+++ b/trunk/arch/powerpc/kernel/prom.c
@@ -1056,8 +1056,6 @@ void __init early_init_devtree(void *params)
 	DBG(" <- early_init_devtree()\n");
 }
 
-#undef printk
-
 int of_n_addr_cells(struct device_node* np)
 {
 	const int *ip;