diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-12-01 16:18:56 -0500 |
| commit | c99da91e7a12724127475a85cc7a38214b3504e2 (patch) | |
| tree | de0eb3fe32ce58804457963fd133a53bb8fba5b8 /include/asm-blackfin/io.h | |
| parent | a31e23e15cbb9734c5883a4a7f58d8712d303e0b (diff) | |
| parent | 92d499d991ec4f5cbd00d6f33967eab9d3ee8d6c (diff) | |
Merge branch 'master' into upstream-fixes
Diffstat (limited to 'include/asm-blackfin/io.h')
| -rw-r--r-- | include/asm-blackfin/io.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h index d1d2e6be3b59..1601d62f39a5 100644 --- a/include/asm-blackfin/io.h +++ b/include/asm-blackfin/io.h | |||
| @@ -122,6 +122,7 @@ extern void outsl(unsigned long port, const void *addr, unsigned long count); | |||
| 122 | extern void insb(unsigned long port, void *addr, unsigned long count); | 122 | extern void insb(unsigned long port, void *addr, unsigned long count); |
| 123 | extern void insw(unsigned long port, void *addr, unsigned long count); | 123 | extern void insw(unsigned long port, void *addr, unsigned long count); |
| 124 | extern void insl(unsigned long port, void *addr, unsigned long count); | 124 | extern void insl(unsigned long port, void *addr, unsigned long count); |
| 125 | extern void insl_16(unsigned long port, void *addr, unsigned long count); | ||
| 125 | 126 | ||
| 126 | extern void dma_outsb(unsigned long port, const void *addr, unsigned short count); | 127 | extern void dma_outsb(unsigned long port, const void *addr, unsigned short count); |
| 127 | extern void dma_outsw(unsigned long port, const void *addr, unsigned short count); | 128 | extern void dma_outsw(unsigned long port, const void *addr, unsigned short count); |