diff --git a/[refs] b/[refs]
index 7cf06636013e..36a3899fcc30 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 10cbb0ba4282407ee3c4a09552d80941bfdfeb77
+refs/heads/master: ff7cbc4b5c6276865a6db594c4b8459ebad457a4
diff --git a/trunk/arch/blackfin/include/asm/bfin5xx_spi.h b/trunk/arch/blackfin/include/asm/bfin5xx_spi.h
index 0b5136e334b5..5392583d0253 100644
--- a/trunk/arch/blackfin/include/asm/bfin5xx_spi.h
+++ b/trunk/arch/blackfin/include/asm/bfin5xx_spi.h
@@ -60,6 +60,8 @@ struct bfin_spi_regs {
 	__BFP(shadow);
 };
 
+#undef __BFP
+
 #define MAX_CTRL_CS          8  /* cs in spi controller */
 
 /* device.platform_data for SSP controller devices */
diff --git a/trunk/arch/blackfin/include/asm/bfin_ppi.h b/trunk/arch/blackfin/include/asm/bfin_ppi.h
index 003900886f97..3be05faa2c65 100644
--- a/trunk/arch/blackfin/include/asm/bfin_ppi.h
+++ b/trunk/arch/blackfin/include/asm/bfin_ppi.h
@@ -48,4 +48,6 @@ struct bfin_eppi_regs {
 	u32 clip;
 };
 
+#undef __BFP
+
 #endif
diff --git a/trunk/arch/blackfin/include/asm/bfin_twi.h b/trunk/arch/blackfin/include/asm/bfin_twi.h
index cc155e14e55c..e767d649dfc4 100644
--- a/trunk/arch/blackfin/include/asm/bfin_twi.h
+++ b/trunk/arch/blackfin/include/asm/bfin_twi.h
@@ -40,4 +40,6 @@ struct bfin_twi_regs {
 	__BFP(rcv_data16);
 };
 
+#undef __BFP
+
 #endif