diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 16:32:05 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-10 16:32:05 -0400 |
| commit | 0ab598099c18affd73a21482274c00e8119236be (patch) | |
| tree | 599ddc4ffb8bfa4bb6364eb4f4a3e91bfd9cb6c9 /include/asm-sparc64 | |
| parent | b526ca438b95a6d71210e0ffc79aabac8aba2b1e (diff) | |
| parent | 26e6385f14b991e30450daee4348cbbc4bc4bb09 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Use alloc_pci_dev() in PCI bus probes.
[SPARC64]: Bump PROMINTR_MAX to 32.
[SPARC64]: Fix recursion in PROM tree building.
[SERIAL] sunzilog: Interrupt enable before ISR handler installed
[SPARC64] PCI: Consolidate PCI access code into pci_common.c
Diffstat (limited to 'include/asm-sparc64')
| -rw-r--r-- | include/asm-sparc64/openprom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc64/openprom.h b/include/asm-sparc64/openprom.h index e01b80559c93..26ec046715c8 100644 --- a/include/asm-sparc64/openprom.h +++ b/include/asm-sparc64/openprom.h | |||
| @@ -177,7 +177,7 @@ struct linux_nodeops { | |||
| 177 | /* More fun PROM structures for device probing. */ | 177 | /* More fun PROM structures for device probing. */ |
| 178 | #define PROMREG_MAX 24 | 178 | #define PROMREG_MAX 24 |
| 179 | #define PROMVADDR_MAX 16 | 179 | #define PROMVADDR_MAX 16 |
| 180 | #define PROMINTR_MAX 15 | 180 | #define PROMINTR_MAX 32 |
| 181 | 181 | ||
| 182 | struct linux_prom_registers { | 182 | struct linux_prom_registers { |
| 183 | unsigned which_io; /* hi part of physical address */ | 183 | unsigned which_io; /* hi part of physical address */ |