diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-19 00:09:53 -0500 |
| commit | 418fbfe979d96efc7b91f29b2085d51541c61f0b (patch) | |
| tree | a9acb07328e0c76011727d5b3b6f5407afcd2866 /include/asm-sparc/pcic.h | |
| parent | 8b132f4ee7304fec4fa27dec67879bc0172e916a (diff) | |
| parent | ff60dde9e46b87757d5e83bd58be0688fca8e816 (diff) | |
Merge branch 'master'
Diffstat (limited to 'include/asm-sparc/pcic.h')
| -rw-r--r-- | include/asm-sparc/pcic.h | 6 |
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 @@ | |||
| 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; |