diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 17:17:40 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 17:17:40 -0400 |
| commit | d06e7a56d91328267a96b1a4df4ede7529f829e8 (patch) | |
| tree | b8034a35c50986d93cb7c0f691f9471bc27b74d1 /arch/sparc64/kernel/pci_psycho.c | |
| parent | 346fced899c7390e555cf90cd07d1e56b460d21b (diff) | |
| parent | 864ae180074931f3a28c84ea85aa8cfeca18bc4f (diff) | |
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/pci_psycho.c')
| -rw-r--r-- | arch/sparc64/kernel/pci_psycho.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c index 534320ef0db2..91ab466d6c66 100644 --- a/arch/sparc64/kernel/pci_psycho.c +++ b/arch/sparc64/kernel/pci_psycho.c | |||
| @@ -1303,8 +1303,7 @@ static void psycho_controller_hwinit(struct pci_controller_info *p) | |||
| 1303 | { | 1303 | { |
| 1304 | u64 tmp; | 1304 | u64 tmp; |
| 1305 | 1305 | ||
| 1306 | /* PROM sets the IRQ retry value too low, increase it. */ | 1306 | psycho_write(p->pbm_A.controller_regs + PSYCHO_IRQ_RETRY, 5); |
| 1307 | psycho_write(p->pbm_A.controller_regs + PSYCHO_IRQ_RETRY, 0xff); | ||
| 1308 | 1307 | ||
| 1309 | /* Enable arbiter for all PCI slots. */ | 1308 | /* Enable arbiter for all PCI slots. */ |
| 1310 | tmp = psycho_read(p->pbm_A.controller_regs + PSYCHO_PCIA_CTRL); | 1309 | tmp = psycho_read(p->pbm_A.controller_regs + PSYCHO_PCIA_CTRL); |