From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 18 May 2011 07:11:42 +0000 (-0400)
Subject: Blackfin: portmux: allow header to be included in assembly files
X-Git-Tag: v2011.09-rc1~95^2~9
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f75e8b32ad59a0813723fa53f12082e7e04d659c;p=u-boot

Blackfin: portmux: allow header to be included in assembly files

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/arch/blackfin/include/asm/portmux.h b/arch/blackfin/include/asm/portmux.h
index b17207fbd4..300ef44fd1 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