diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-14 15:27:17 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-14 15:27:17 -0400 |
| commit | 29e0937bb693879221f575b01f26314b3f443322 (patch) | |
| tree | dd3ed9be21ff200c9d4dd8c708bc2ea1ef3d32f4 /include/asm-sparc/system.h | |
| parent | 140ff8b0459cac5ade7a42131f561a9ee0fa3cc4 (diff) | |
| parent | be35cf01a9889e82da3bbda1d7b161f036424225 (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]: Update defconfig.
[VIDEO]: XVR-500 and XVR-2500 need FB=y.
[SPARC32]: asm/system.h needs asm/smp.h
[SPARC32]: Update defconfig.
[SPARC32]: Fix sparc32 kdebug changes.
[SPARC64]: Accept ebus_bus_type for generic DMA ops.
[SPARC64]: Add missing cpus_empty() check in hypervisor xcall handling.
[SCSI]: Add help text for SCSI_ESP_CORE.
[SPARC] SBUS: display7seg.c needs asm/io.h
[SPARC] SBUS: bbc_i2c.c needs asm/io.h
[SPARC64]: Be more resiliant with PCI I/O space regs.
[SERIAL] SUNHV: Add an ID string.
Diffstat (limited to 'include/asm-sparc/system.h')
| -rw-r--r-- | include/asm-sparc/system.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-sparc/system.h b/include/asm-sparc/system.h index 8b6d9c9c8b93..8b4e23b3bb38 100644 --- a/include/asm-sparc/system.h +++ b/include/asm-sparc/system.h | |||
| @@ -11,6 +11,7 @@ | |||
| 11 | #include <asm/psr.h> | 11 | #include <asm/psr.h> |
| 12 | #include <asm/ptrace.h> | 12 | #include <asm/ptrace.h> |
| 13 | #include <asm/btfixup.h> | 13 | #include <asm/btfixup.h> |
| 14 | #include <asm/smp.h> | ||
| 14 | 15 | ||
| 15 | #ifndef __ASSEMBLY__ | 16 | #ifndef __ASSEMBLY__ |
| 16 | 17 | ||