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]: Fix stack overflow checking in modular non-SMP kernels. [SPARC64]: Fix sparc64 build errors when CONFIG_PCI=n.
Showing
- arch/sparc64/kernel/prom.c 2 additions, 0 deletionsarch/sparc64/kernel/prom.c
- arch/sparc64/kernel/sparc64_ksyms.c 5 additions, 5 deletionsarch/sparc64/kernel/sparc64_ksyms.c
- arch/sparc64/kernel/time.c 4 additions, 1 deletionarch/sparc64/kernel/time.c
- include/asm-sparc64/dma-mapping.h 14 additions, 0 deletionsinclude/asm-sparc64/dma-mapping.h
Please register or sign in to comment