diff options
| author | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-12-12 17:41:41 -0500 |
| commit | c4366889dda8110247be59ca41fddb82951a8c26 (patch) | |
| tree | 705c1a996bed8fd48ce94ff33ec9fd00f9b94875 /include/linux/sunrpc/auth_gss.h | |
| parent | db2fb9db5735cc532fd4fc55e94b9a3c3750378e (diff) | |
| parent | e1036502e5263851259d147771226161e5ccc85a (diff) | |
Merge ../linus
Conflicts:
drivers/cpufreq/cpufreq.c
Diffstat (limited to 'include/linux/sunrpc/auth_gss.h')
| -rw-r--r-- | include/linux/sunrpc/auth_gss.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/sunrpc/auth_gss.h b/include/linux/sunrpc/auth_gss.h index 97b62e97dd8d..2db2fbf34947 100644 --- a/include/linux/sunrpc/auth_gss.h +++ b/include/linux/sunrpc/auth_gss.h | |||
| @@ -90,8 +90,6 @@ struct gss_cred { | |||
| 90 | #define gc_flags gc_base.cr_flags | 90 | #define gc_flags gc_base.cr_flags |
| 91 | #define gc_expire gc_base.cr_expire | 91 | #define gc_expire gc_base.cr_expire |
| 92 | 92 | ||
| 93 | void print_hexl(u32 *p, u_int length, u_int offset); | ||
| 94 | |||
| 95 | #endif /* __KERNEL__ */ | 93 | #endif /* __KERNEL__ */ |
| 96 | #endif /* _LINUX_SUNRPC_AUTH_GSS_H */ | 94 | #endif /* _LINUX_SUNRPC_AUTH_GSS_H */ |
| 97 | 95 | ||