[U-Boot] [PATCH 12/18] Blackfin: portmux: allow header to be included in assembly files

Mike Frysinger vapier at gentoo.org
Tue Jun 28 21:36:21 CEST 2011


Signed-off-by: Mike Frysinger <vapier at gentoo.org>
---
 arch/blackfin/include/asm/portmux.h |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h
index b17207f..300ef44 100644
--- a/arch/blackfin/include/asm/portmux.h
+++ b/arch/blackfin/include/asm/portmux.h
@@ -22,11 +22,15 @@
 #define peripheral_request_list(per, label) peripheral_request_list(per)
 #endif
 
+#ifndef __ASSEMBLY__
+
 int peripheral_request(unsigned short per, const char *label);
 void peripheral_free(unsigned short per);
 int peripheral_request_list(const unsigned short per[], const char *label);
 void peripheral_free_list(const unsigned short per[]);
 
+#endif
+
 #include <asm/blackfin.h>
 
 #ifndef P_SPORT2_TFS
-- 
1.7.5.3



More information about the U-Boot mailing list