git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
arch
/
mips
/
include
/
asm
/
txx9
/
tx4939.h
diff --git
a/arch/mips/include/asm/txx9/tx4939.h
b/arch/mips/include/asm/txx9/tx4939.h
index 964ef7ede2684eaff7d8f8c1ad1e5e83a7b6c651..f02c50b3abfbd205f29dbd51aa828c7f5996b165 100644
(file)
--- a/
arch/mips/include/asm/txx9/tx4939.h
+++ b/
arch/mips/include/asm/txx9/tx4939.h
@@
-542,5
+542,7
@@
int tx4939_irq(void);
void tx4939_mtd_init(int ch);
void tx4939_ata_init(void);
void tx4939_rtc_init(void);
void tx4939_mtd_init(int ch);
void tx4939_ata_init(void);
void tx4939_rtc_init(void);
+void tx4939_ndfmc_init(unsigned int hold, unsigned int spw,
+ unsigned char ch_mask, unsigned char wide_mask);
#endif /* __ASM_TXX9_TX4939_H */
#endif /* __ASM_TXX9_TX4939_H */