diff options
| author | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2010-08-26 13:22:27 -0400 |
| commit | f632265d0ffb5acf331252d98c64939849d96bb2 (patch) | |
| tree | 31187d9a726bf1ca6ca12e26ad8e7c609eaf4d8b /fs/cifs/dns_resolve.h | |
| parent | 7d94784293096c0a46897acdb83be5abd9278ece (diff) | |
| parent | da5cabf80e2433131bf0ed8993abc0f7ea618c73 (diff) | |
Merge commit 'v2.6.36-rc1' into HEAD
Diffstat (limited to 'fs/cifs/dns_resolve.h')
| -rw-r--r-- | fs/cifs/dns_resolve.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/cifs/dns_resolve.h b/fs/cifs/dns_resolve.h index 966e9288930b..d3f5d27f4d06 100644 --- a/fs/cifs/dns_resolve.h +++ b/fs/cifs/dns_resolve.h @@ -24,8 +24,6 @@ #define _DNS_RESOLVE_H #ifdef __KERNEL__ -#include <linux/key-type.h> -extern struct key_type key_type_dns_resolver; extern int dns_resolve_server_name_to_ip(const char *unc, char **ip_addr); #endif /* KERNEL */ |