diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /include/asm-m32r/shmparam.h | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'include/asm-m32r/shmparam.h')
| -rw-r--r-- | include/asm-m32r/shmparam.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/asm-m32r/shmparam.h b/include/asm-m32r/shmparam.h index db0019ba955d..35986d81a528 100644 --- a/include/asm-m32r/shmparam.h +++ b/include/asm-m32r/shmparam.h | |||
| @@ -1,8 +1,6 @@ | |||
| 1 | #ifndef _ASM_M32R_SHMPARAM_H | 1 | #ifndef _ASM_M32R_SHMPARAM_H |
| 2 | #define _ASM_M32R_SHMPARAM_H | 2 | #define _ASM_M32R_SHMPARAM_H |
| 3 | 3 | ||
| 4 | /* $Id$ */ | ||
| 5 | |||
| 6 | #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ | 4 | #define SHMLBA PAGE_SIZE /* attach addr a multiple of this */ |
| 7 | 5 | ||
| 8 | #endif /* _ASM_M32R_SHMPARAM_H */ | 6 | #endif /* _ASM_M32R_SHMPARAM_H */ |