diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2007-10-12 21:27:47 -0400 |
| commit | b981d8b3f5e008ff10d993be633ad00564fc22cd (patch) | |
| tree | e292dc07b22308912cf6a58354a608b9e5e8e1fd /include/asm-blackfin/io.h | |
| parent | b11d2127c4893a7315d1e16273bc8560049fa3ca (diff) | |
| parent | 2b9e0aae1d50e880c58d46788e5e3ebd89d75d62 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/macintosh/adbhid.c
Diffstat (limited to 'include/asm-blackfin/io.h')
| -rw-r--r-- | include/asm-blackfin/io.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/include/asm-blackfin/io.h b/include/asm-blackfin/io.h index 142cb333db29..525179bf43d7 100644 --- a/include/asm-blackfin/io.h +++ b/include/asm-blackfin/io.h | |||
| @@ -115,21 +115,21 @@ static inline unsigned int readl(const volatile void __iomem *addr) | |||
| 115 | 115 | ||
| 116 | #ifndef __ASSEMBLY__ | 116 | #ifndef __ASSEMBLY__ |
| 117 | 117 | ||
| 118 | extern void outsb(void __iomem *port, const void *addr, unsigned short count); | 118 | extern void outsb(unsigned long port, const void *addr, unsigned long count); |
| 119 | extern void outsw(void __iomem *port, const void *addr, unsigned short count); | 119 | extern void outsw(unsigned long port, const void *addr, unsigned long count); |
| 120 | extern void outsl(void __iomem *port, const void *addr, unsigned short count); | 120 | extern void outsl(unsigned long port, const void *addr, unsigned long count); |
| 121 | 121 | ||
| 122 | extern void insb(const void __iomem *port, void *addr, unsigned short count); | 122 | extern void insb(unsigned long port, void *addr, unsigned long count); |
| 123 | extern void insw(const void __iomem *port, void *addr, unsigned short count); | 123 | extern void insw(unsigned long port, void *addr, unsigned long count); |
| 124 | extern void insl(const void __iomem *port, void *addr, unsigned short count); | 124 | extern void insl(unsigned long port, void *addr, unsigned long count); |
| 125 | 125 | ||
| 126 | extern void dma_outsb(void __iomem *port, const void *addr, unsigned short count); | 126 | extern void dma_outsb(unsigned long port, const void *addr, unsigned short count); |
| 127 | extern void dma_outsw(void __iomem *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_outsl(void __iomem *port, const void *addr, unsigned short count); | 128 | extern void dma_outsl(unsigned long port, const void *addr, unsigned short count); |
| 129 | 129 | ||
| 130 | extern void dma_insb(const void __iomem *port, void *addr, unsigned short count); | 130 | extern void dma_insb(unsigned long port, void *addr, unsigned short count); |
| 131 | extern void dma_insw(const void __iomem *port, void *addr, unsigned short count); | 131 | extern void dma_insw(unsigned long port, void *addr, unsigned short count); |
| 132 | extern void dma_insl(const void __iomem *port, void *addr, unsigned short count); | 132 | extern void dma_insl(unsigned long port, void *addr, unsigned short count); |
| 133 | 133 | ||
| 134 | /* | 134 | /* |
| 135 | * Map some physical address range into the kernel address space. | 135 | * Map some physical address range into the kernel address space. |