diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:12:23 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:12:23 +0200 |
commit | cfcfdff59b411249d7c660dcf08a9a3f3df9e641 (patch) | |
tree | c12d4e2a03dacd62e4656991bdff64c20eca8c1c /include/asm-v850/clinkage.h | |
parent | d3794979a8a80c222ce9d016a6dfc4bed36965d0 (diff) | |
parent | 066519068ad2fbe98c7f45552b1f592903a9c8c8 (diff) |
Merge branch 'linus' into core/percputip-core-percpu-2008-06-16_09.12_Mon
Diffstat (limited to 'include/asm-v850/clinkage.h')
-rw-r--r-- | include/asm-v850/clinkage.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-v850/clinkage.h b/include/asm-v850/clinkage.h index 2b622adccae5..c389691d6f86 100644 --- a/include/asm-v850/clinkage.h +++ b/include/asm-v850/clinkage.h @@ -11,7 +11,7 @@ * Written by Miles Bader <miles@gnu.org> */ -#ifndef __CLINKAGE_H__ +#ifndef __V850_CLINKAGE_H__ #define __V850_CLINKAGE_H__ #include <asm/macrology.h> |