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 10:01:28 -0800 |
| commit | f8ad23a401d41f90cb377035d206b41de0699a0b (patch) | |
| tree | f40e6ab11d323b50fe3e47dc1e451f68d304cf6f | |
| parent | 7116317dc9148d783846299fc80a7d377baa6dca (diff) | |
| download | talos-op-linux-f8ad23a401d41f90cb377035d206b41de0699a0b.tar.gz talos-op-linux-f8ad23a401d41f90cb377035d206b41de0699a0b.zip | |
[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[] = { static int pcic0_up; static struct linux_pcic pcic0; -void * __iomem pcic_regs; +void __iomem *pcic_regs; volatile int pcic_speculative; volatile int pcic_trapped; 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 @@ #include <asm/pbm.h> struct linux_pcic { - void * __iomem pcic_regs; + void __iomem *pcic_regs; unsigned long pcic_io; - void * __iomem pcic_config_space_addr; - void * __iomem pcic_config_space_data; + void __iomem *pcic_config_space_addr; + void __iomem *pcic_config_space_data; struct resource pcic_res_regs; struct resource pcic_res_io; struct resource pcic_res_cfg_addr; |
