diff options
| author | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
|---|---|---|
| committer | David Vrabel <david.vrabel@csr.com> | 2008-11-19 09:48:07 -0500 |
| commit | dba0a918722ee0f0ba3442575e4448c3ab622be4 (patch) | |
| tree | fdb466cf09e7916135098d651b18924b2fe9ba5f /arch/mips/include/asm/txx9 | |
| parent | 0996e6382482ce9014787693d3884e9468153a5c (diff) | |
| parent | 7f0f598a0069d1ab072375965a4b69137233169c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into for-upstream
Diffstat (limited to 'arch/mips/include/asm/txx9')
| -rw-r--r-- | arch/mips/include/asm/txx9/generic.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/include/asm/txx9/generic.h b/arch/mips/include/asm/txx9/generic.h index 4316a3e57678..9cde0090cbf6 100644 --- a/arch/mips/include/asm/txx9/generic.h +++ b/arch/mips/include/asm/txx9/generic.h | |||
| @@ -86,4 +86,9 @@ void txx9_iocled_init(unsigned long baseaddr, | |||
| 86 | int basenum, unsigned int num, int lowactive, | 86 | int basenum, unsigned int num, int lowactive, |
| 87 | const char *color, char **deftriggers); | 87 | const char *color, char **deftriggers); |
| 88 | 88 | ||
| 89 | /* 7SEG LED */ | ||
| 90 | void txx9_7segled_init(unsigned int num, | ||
| 91 | void (*putc)(unsigned int pos, unsigned char val)); | ||
| 92 | int txx9_7segled_putc(unsigned int pos, char c); | ||
| 93 | |||
| 89 | #endif /* __ASM_TXX9_GENERIC_H */ | 94 | #endif /* __ASM_TXX9_GENERIC_H */ |