git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.infradead.org/mtd-2.6
[pandora-kernel.git]
/
include
/
asm-mips
/
txx9
/
tx4927.h
diff --git
a/include/asm-mips/txx9/tx4927.h
b/include/asm-mips/txx9/tx4927.h
index
ceb4b79
..
195f651
100644
(file)
--- a/
include/asm-mips/txx9/tx4927.h
+++ b/
include/asm-mips/txx9/tx4927.h
@@
-243,12
+243,13
@@
static inline void tx4927_ccfg_change(__u64 change, __u64 new)
}
unsigned int tx4927_get_mem_size(void);
}
unsigned int tx4927_get_mem_size(void);
-void tx4927_wd
r
_init(void);
+void tx4927_wd
t
_init(void);
void tx4927_setup(void);
void tx4927_time_init(unsigned int tmrnr);
void tx4927_setup(void);
void tx4927_time_init(unsigned int tmrnr);
-void tx4927_s
etup_serial(void
);
+void tx4927_s
io_init(unsigned int sclk, unsigned int cts_mask
);
int tx4927_report_pciclk(void);
int tx4927_pciclk66_setup(void);
int tx4927_report_pciclk(void);
int tx4927_pciclk66_setup(void);
+void tx4927_setup_pcierr_irq(void);
void tx4927_irq_init(void);
#endif /* __ASM_TXX9_TX4927_H */
void tx4927_irq_init(void);
#endif /* __ASM_TXX9_TX4927_H */