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 /net/rxrpc/internal.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 'net/rxrpc/internal.h')
| -rw-r--r-- | net/rxrpc/internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/rxrpc/internal.h b/net/rxrpc/internal.h index 70e52f6b0b64..cc0c5795a103 100644 --- a/net/rxrpc/internal.h +++ b/net/rxrpc/internal.h | |||
| @@ -14,7 +14,7 @@ | |||
| 14 | */ | 14 | */ |
| 15 | #if 1 | 15 | #if 1 |
| 16 | #define __RXACCT_DECL(X) X | 16 | #define __RXACCT_DECL(X) X |
| 17 | #define __RXACCT(X) do { X; } while(0) | 17 | #define __RXACCT(X) do { X; } while(0) |
| 18 | #else | 18 | #else |
| 19 | #define __RXACCT_DECL(X) | 19 | #define __RXACCT_DECL(X) |
| 20 | #define __RXACCT(X) do { } while(0) | 20 | #define __RXACCT(X) do { } while(0) |