---

yaml --- r: 217164 b: refs/heads/master c: ff7cbc4 h: refs/heads/master v: v3
git-mirror · Oct 25, 2010 · 33af282 · 33af282
1 parent ca81441
commit 33af282
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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
@@ -40,4 +40,6 @@ struct bfin_twi_regs {
 	__BFP(rcv_data16);
 };
 
+#undef __BFP
+
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -48,4 +48,6 @@ struct bfin_eppi_regs { @@
     	u32 clip;
     };
+    #undef __BFP
     #endif