diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:00 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-06-16 11:24:00 +0200 |
| commit | 6d72b7952fa7d7c61d021398970c29afde6a4443 (patch) | |
| tree | 31c00be8e2837e2db2e62c694421a93a9f4c79d7 /include/asm-v850/clinkage.h | |
| parent | move BUG_TABLE into RODATA (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6 (diff) | |
| download | linux-6d72b7952fa7d7c61d021398970c29afde6a4443.tar.xz linux-6d72b7952fa7d7c61d021398970c29afde6a4443.zip | |
Merge branch 'linus' into core/rodata
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> |