diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-16 17:10:35 -0500 |
| commit | 16e842a62a8ffcc2e51def6ef9fd6e0926539bc5 (patch) | |
| tree | 2cf6c23ab195e68712bca51351c1d37ed950c55d /arch/sparc/kernel/pcic.c | |
| parent | 525352eb6d355bef6adf597252fc6d04f2dbe66c (diff) | |
| parent | 42245e65f356ed54fdf7a1f9a0095e0bc40f73a3 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
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 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 | ||