diff --git a/[refs] b/[refs]
index c7dbe00e201d..0b2959173e83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6a7a5dca0ba4f3a79089ddf5eb7d1abb74a41694
+refs/heads/master: c2068dabebf83a7ef65ba977a165730fb8b53ef0
diff --git a/trunk/arch/sparc/kernel/of_device_64.c b/trunk/arch/sparc/kernel/of_device_64.c
index 3bb2eace58cf..6ecaefc23beb 100644
--- a/trunk/arch/sparc/kernel/of_device_64.c
+++ b/trunk/arch/sparc/kernel/of_device_64.c
@@ -9,6 +9,7 @@
 #include <linux/irq.h>
 #include <linux/of_device.h>
 #include <linux/of_platform.h>
+#include <asm/spitfire.h>
 
 #include "of_device_common.h"
 
diff --git a/trunk/arch/sparc/kernel/pcr.c b/trunk/arch/sparc/kernel/pcr.c
index 343b0f9e2e7b..708406d72bb1 100644
--- a/trunk/arch/sparc/kernel/pcr.c
+++ b/trunk/arch/sparc/kernel/pcr.c
@@ -13,6 +13,7 @@
 #include <asm/pil.h>
 #include <asm/pcr.h>
 #include <asm/nmi.h>
+#include <asm/spitfire.h>
 
 /* This code is shared between various users of the performance
  * counters.  Users will be oprofile, pseudo-NMI watchdog, and the