diff options
| author | Adrian Bunk <bunk@kernel.org> | 2008-05-03 23:51:03 +0300 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-05-04 14:45:55 -0700 |
| commit | 36bbfe2f097d5e09e8e9c83f55264bd538a0ebe1 (patch) | |
| tree | 789ffcdf88d0b4be592be37f60aa706b58a2a880 /include/asm-alpha | |
| parent | afa26be86b65a7183ceac29bdf1f51d6fc6932f0 (diff) | |
fix asm-alpha/types.h breakage
This patch fixes the following compile error on alpha caused by
commit 3726c23df8e4d95b6f2b335dfa90e3f4850a8a00
(alpha: types: use <asm-generic/int-*.h> for the alpha architecture):
<-- snip -->
...
CC arch/alpha/kernel/asm-offsets.s
In file included from include2/asm/topology.h:6,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/topology.h:34,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/mmzone.h:683,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/gfp.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/slab.h:12,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/percpu.h:5,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/rcupdate.h:39,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/pid.h:4,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/include/linux/sched.h:74,
from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:9:
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
include2/asm/machvec.h:44: error: expected declaration specifiers or '...' before 'dma_addr_t'
In file included from /home/bunk/linux/kernel-2.6/git/linux-2.6/arch/alpha/kernel/asm-offsets.c:12:
include2/asm/io.h:94: warning: type defaults to 'int' in declaration of 'dma_addr_t'
include2/asm/io.h:94: warning: variable 'dma_addr_t' declared 'inline'
include2/asm/io.h:94: error: expected ',' or ';' before 'isa_page_to_bus'
make[2]: *** [arch/alpha/kernel/asm-offsets.s] Error 1
<-- snip -->
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'include/asm-alpha')
| -rw-r--r-- | include/asm-alpha/types.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/asm-alpha/types.h b/include/asm-alpha/types.h index a9e34ca4d463..c1541353ccef 100644 --- a/include/asm-alpha/types.h +++ b/include/asm-alpha/types.h @@ -23,5 +23,11 @@ typedef unsigned int umode_t; #define BITS_PER_LONG 64 +#ifndef __ASSEMBLY__ + +typedef u64 dma_addr_t; +typedef u64 dma64_addr_t; + +#endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ #endif /* _ALPHA_TYPES_H */ |