diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-24 09:31:05 -0500 |
| commit | aaadff81195056c7c14e0d834b3318c624c0fd78 (patch) | |
| tree | 34d66d8dcb25fa9ffb568f8acfdb317ddf203b44 /arch/sparc/kernel/pcic.c | |
| parent | c6329f4df2263ab5a40601a5236639e61b682f51 (diff) | |
| parent | df7addbb45874f0f992266003155de5a22e1872f (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/sparc/kernel/pcic.c')
| -rw-r--r-- | arch/sparc/kernel/pcic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c index cccfc12802e..42002b742de 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 | ||