diff options
author | Dmitry Torokhov <dtor@vmware.com> | 2013-02-18 01:04:11 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-02-18 15:02:51 -0500 |
commit | 7ccd7de691bcc7194deb68b1db391861ada5427e (patch) | |
tree | 061bc8ce013d54ec5ae5b4dcf03702c69cc46ee7 /net/vmw_vsock | |
parent | 7777ac3860327da557665f6e53cd82fbe40f151b (diff) |
VSOCK: get rid of vsock_version.h
There isn't really a need to have a separate file for it.
Acked-by: Andy King <acking@vmware.com>
Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/vmw_vsock')
-rw-r--r-- | net/vmw_vsock/af_vsock.c | 3 | ||||
-rw-r--r-- | net/vmw_vsock/vsock_version.h | 22 |
2 files changed, 1 insertions, 24 deletions
diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index a8efe5aaf221..c1b9e55e338e 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c | |||
@@ -98,7 +98,6 @@ | |||
98 | #include <net/sock.h> | 98 | #include <net/sock.h> |
99 | 99 | ||
100 | #include "af_vsock.h" | 100 | #include "af_vsock.h" |
101 | #include "vsock_version.h" | ||
102 | 101 | ||
103 | static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr); | 102 | static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr); |
104 | static void vsock_sk_destruct(struct sock *sk); | 103 | static void vsock_sk_destruct(struct sock *sk); |
@@ -2009,5 +2008,5 @@ EXPORT_SYMBOL_GPL(vsock_core_exit); | |||
2009 | 2008 | ||
2010 | MODULE_AUTHOR("VMware, Inc."); | 2009 | MODULE_AUTHOR("VMware, Inc."); |
2011 | MODULE_DESCRIPTION("VMware Virtual Socket Family"); | 2010 | MODULE_DESCRIPTION("VMware Virtual Socket Family"); |
2012 | MODULE_VERSION(VSOCK_DRIVER_VERSION_STRING); | 2011 | MODULE_VERSION("1.0.0.0-k"); |
2013 | MODULE_LICENSE("GPL v2"); | 2012 | MODULE_LICENSE("GPL v2"); |
diff --git a/net/vmw_vsock/vsock_version.h b/net/vmw_vsock/vsock_version.h deleted file mode 100644 index 4df7f5e2151c..000000000000 --- a/net/vmw_vsock/vsock_version.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* | ||
2 | * VMware vSockets Driver | ||
3 | * | ||
4 | * Copyright (C) 2011-2012 VMware, Inc. All rights reserved. | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify it | ||
7 | * under the terms of the GNU General Public License as published by the Free | ||
8 | * Software Foundation version 2 and no later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, but WITHOUT | ||
11 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
12 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for | ||
13 | * more details. | ||
14 | */ | ||
15 | |||
16 | #ifndef _VSOCK_VERSION_H_ | ||
17 | #define _VSOCK_VERSION_H_ | ||
18 | |||
19 | #define VSOCK_DRIVER_VERSION_PARTS { 1, 0, 0, 0 } | ||
20 | #define VSOCK_DRIVER_VERSION_STRING "1.0.0.0-k" | ||
21 | |||
22 | #endif /* _VSOCK_VERSION_H_ */ | ||