summaryrefslogtreecommitdiff
path: root/include/asm-mips/txx9/smsc_fdc37m81x.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-08-20 14:39:18 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-20 14:39:18 +0400
commit170465ee7f5a9a2d0ac71285507e52642e040353 (patch)
treedbca81f04cde9e625170abbd6a72555cfbeb194e /include/asm-mips/txx9/smsc_fdc37m81x.h
parent169ad16bb87c10a3f7c108bb7008ebc0270f617a (diff)
parent1fca25427482387689fa27594c992a961d98768f (diff)
downloadlinux-170465ee7f5a9a2d0ac71285507e52642e040353.tar.xz
Merge branch 'linus' into x86/xen
Diffstat (limited to 'include/asm-mips/txx9/smsc_fdc37m81x.h')
-rw-r--r--include/asm-mips/txx9/smsc_fdc37m81x.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/txx9/smsc_fdc37m81x.h b/include/asm-mips/txx9/smsc_fdc37m81x.h
index 9375e4fc2289..02e161d0755d 100644
--- a/include/asm-mips/txx9/smsc_fdc37m81x.h
+++ b/include/asm-mips/txx9/smsc_fdc37m81x.h
@@ -56,7 +56,7 @@
#define SMSC_FDC37M81X_CONFIG_EXIT 0xaa
#define SMSC_FDC37M81X_CHIP_ID 0x4d
-unsigned long __init smsc_fdc37m81x_init(unsigned long port);
+unsigned long smsc_fdc37m81x_init(unsigned long port);
void smsc_fdc37m81x_config_beg(void);