diff options
| author | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 22:24:06 +0200 |
|---|---|---|
| committer | J. Bruce Fields <bfields@citi.umich.edu> | 2008-07-03 22:24:06 +0200 |
| commit | e86322f611eef95aafaf726fd3965e5b211f1985 (patch) | |
| tree | 28547e26df4fc6ae671dc8cc6912a53717e4db08 /include/asm-v850/clinkage.h | |
| parent | nfsd: dprint operation names (diff) | |
| parent | svcrdma: Change WR context get/put to use the kmem cache (diff) | |
| download | linux-e86322f611eef95aafaf726fd3965e5b211f1985.tar.xz linux-e86322f611eef95aafaf726fd3965e5b211f1985.zip | |
Merge branch 'for-bfields' of git://linux-nfs.org/~tomtucker/xprt-switch-2.6 into for-2.6.27
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> |