Skip to content

Commit

Permalink
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-…
Browse files Browse the repository at this point in the history
…linus

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
  MIPS: IP32: Update defconfig
  MIPS: Add missing calls to plat_unmap_dma_mem.
  MIPS: Kconfig: Fix the arch-specific header path
  MIPS: Use EI/DI for MIPS R2.
  • Loading branch information
torvalds committed Dec 13, 2008
2 parents 1c55f18 + 6d8a52d commit fae1aa4
Show file tree
Hide file tree
Showing 4 changed files with 638 additions and 437 deletions.
2 changes: 1 addition & 1 deletion arch/mips/Kconfig.debug
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ config RUNTIME_DEBUG
help
If you say Y here, some debugging macros will do run-time checking.
If you say N here, those macros will mostly turn to no-ops. See
include/asm-mips/debug.h for debuging macros.
arch/mips/include/asm/debug.h for debugging macros.
If unsure, say N.

endmenu
Loading

0 comments on commit fae1aa4

Please sign in to comment.