summaryrefslogtreecommitdiffstats
path: root/net/vmw_vsock
diff options
context:
space:
mode:
authorDmitry Torokhov <dtor@vmware.com>2013-02-18 06:04:11 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-18 15:02:51 -0500
commit7ccd7de691bcc7194deb68b1db391861ada5427e (patch)
tree061bc8ce013d54ec5ae5b4dcf03702c69cc46ee7 /net/vmw_vsock
parent7777ac3860327da557665f6e53cd82fbe40f151b (diff)
downloadlinux-stable-7ccd7de691bcc7194deb68b1db391861ada5427e.tar.gz
linux-stable-7ccd7de691bcc7194deb68b1db391861ada5427e.tar.bz2
linux-stable-7ccd7de691bcc7194deb68b1db391861ada5427e.zip
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.c3
-rw-r--r--net/vmw_vsock/vsock_version.h22
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 @@
#include <net/sock.h>
#include "af_vsock.h"
-#include "vsock_version.h"
static int __vsock_bind(struct sock *sk, struct sockaddr_vm *addr);
static void vsock_sk_destruct(struct sock *sk);
@@ -2009,5 +2008,5 @@ EXPORT_SYMBOL_GPL(vsock_core_exit);
MODULE_AUTHOR("VMware, Inc.");
MODULE_DESCRIPTION("VMware Virtual Socket Family");
-MODULE_VERSION(VSOCK_DRIVER_VERSION_STRING);
+MODULE_VERSION("1.0.0.0-k");
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 @@
-/*
- * VMware vSockets Driver
- *
- * Copyright (C) 2011-2012 VMware, Inc. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation version 2 and no later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
- * more details.
- */
-
-#ifndef _VSOCK_VERSION_H_
-#define _VSOCK_VERSION_H_
-
-#define VSOCK_DRIVER_VERSION_PARTS { 1, 0, 0, 0 }
-#define VSOCK_DRIVER_VERSION_STRING "1.0.0.0-k"
-
-#endif /* _VSOCK_VERSION_H_ */