diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2005-12-06 05:44:18 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-15 13:01:28 -0500 |
commit | f8ad23a401d41f90cb377035d206b41de0699a0b (patch) | |
tree | f40e6ab11d323b50fe3e47dc1e451f68d304cf6f | |
parent | 7116317dc9148d783846299fc80a7d377baa6dca (diff) |
[PATCH] fix iomem annotations in sparc32 pcic code
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/sparc/kernel/pcic.c | 2 | ||||
-rw-r--r-- | include/asm-sparc/pcic.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index cccfc12802ed..42002b742deb 100644 --- a/arch/sparc/kernel/pcic.c +++ b/arch/sparc/kernel/pcic.c | |||
@@ -161,7 +161,7 @@ static struct pcic_sn2list pcic_known_sysnames[] = { | |||
161 | static int pcic0_up; | 161 | static int pcic0_up; |
162 | static struct linux_pcic pcic0; | 162 | static struct linux_pcic pcic0; |
163 | 163 | ||
164 | void * __iomem pcic_regs; | 164 | void __iomem *pcic_regs; |
165 | volatile int pcic_speculative; | 165 | volatile int pcic_speculative; |
166 | volatile int pcic_trapped; | 166 | volatile int pcic_trapped; |
167 | 167 | ||
diff --git a/include/asm-sparc/pcic.h b/include/asm-sparc/pcic.h index 301ae8022ddd..dedea14d87c8 100644 --- a/include/asm-sparc/pcic.h +++ b/include/asm-sparc/pcic.h | |||
@@ -16,10 +16,10 @@ | |||
16 | #include <asm/pbm.h> | 16 | #include <asm/pbm.h> |
17 | 17 | ||
18 | struct linux_pcic { | 18 | struct linux_pcic { |
19 | void * __iomem pcic_regs; | 19 | void __iomem *pcic_regs; |
20 | unsigned long pcic_io; | 20 | unsigned long pcic_io; |
21 | void * __iomem pcic_config_space_addr; | 21 | void __iomem *pcic_config_space_addr; |
22 | void * __iomem pcic_config_space_data; | 22 | void __iomem *pcic_config_space_data; |
23 | struct resource pcic_res_regs; | 23 | struct resource pcic_res_regs; |
24 | struct resource pcic_res_io; | 24 | struct resource pcic_res_io; |
25 | struct resource pcic_res_cfg_addr; | 25 | struct resource pcic_res_cfg_addr; |