diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 14:29:53 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-06-05 14:29:53 -0700 |
commit | 5965087dc96167298ab83598f681d4d6f9d324fa (patch) | |
tree | 97feb8d8a546261de23024d5b4ee5797b03f988a /include/asm-mips/rtlx.h | |
parent | 698f7a4a12c15fef354b2a1ac14f90a0e71008d9 (diff) | |
parent | cd9da13d6ef4f4b652a9a885d4a7c80e40fed229 (diff) | |
download | blackbird-op-linux-5965087dc96167298ab83598f681d4d6f9d324fa.tar.gz blackbird-op-linux-5965087dc96167298ab83598f681d4d6f9d324fa.zip |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
Fix divide by zero error in build_clear_page() and build_copy_page()
[MIPS] Fix typo in header guard
[MIPS] Fix build error - Delete debugging crap that crept in with CMP
[MIPS] Add accessors for random register.
[MIPS] IP27: misc fixes
[MIPS] IP27: Fix clockevent setup
[MIPS] IP27: Fix bootmem memory setup
[MIPS] remove CONFIG_CPU_R4000 line from Makefile
[MIPS] Fix check for valid stack pointer during backtrace
[MIPS] Add missing braces to pte_mkyoung
[MIPS] R4700: Fix build_tlb_probe_entry
[MIPS] Alchemy: dbdma: add API to delete custom DDMA device ids.
[MIPS] Alchemy: export get_au1x00_speed for modules
Diffstat (limited to 'include/asm-mips/rtlx.h')
-rw-r--r-- | include/asm-mips/rtlx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-mips/rtlx.h b/include/asm-mips/rtlx.h index 20b666022dcb..4ca3063ed2ce 100644 --- a/include/asm-mips/rtlx.h +++ b/include/asm-mips/rtlx.h @@ -3,7 +3,7 @@ * */ -#ifndef __ASM_RTLX_H +#ifndef __ASM_RTLX_H_ #define __ASM_RTLX_H_ #include <irq.h> |