summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2011-05-18 03:11:42 -0400
committerMike Frysinger <vapier@gentoo.org>2011-07-12 02:17:45 -0400
commitf75e8b32ad59a0813723fa53f12082e7e04d659c (patch)
tree7edbbac985499bb140a183746817ca95207436aa /arch
parentc94101ae9c75c64ffbc8162302c2a1ce53a59f75 (diff)
downloadu-boot-imx-f75e8b32ad59a0813723fa53f12082e7e04d659c.zip
u-boot-imx-f75e8b32ad59a0813723fa53f12082e7e04d659c.tar.gz
u-boot-imx-f75e8b32ad59a0813723fa53f12082e7e04d659c.tar.bz2
Blackfin: portmux: allow header to be included in assembly files
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/blackfin/include/asm/portmux.h4
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