summaryrefslogtreecommitdiffstats
path: root/include/asm-sparc
diff options
context:
space:
mode:
authorAl Viro2005-12-06 11:44:18 +0100
committerLinus Torvalds2005-12-15 19:01:28 +0100
commitf8ad23a401d41f90cb377035d206b41de0699a0b (patch)
treef40e6ab11d323b50fe3e47dc1e451f68d304cf6f /include/asm-sparc
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/bart/ide-2.6 (diff)
downloadkernel-qcow2-linux-f8ad23a401d41f90cb377035d206b41de0699a0b.tar.gz
kernel-qcow2-linux-f8ad23a401d41f90cb377035d206b41de0699a0b.tar.xz
kernel-qcow2-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>
Diffstat (limited to 'include/asm-sparc')
-rw-r--r--include/asm-sparc/pcic.h6
1 files changed, 3 insertions, 3 deletions
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;