From patchwork Mon Feb 18 16:04:11 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy King X-Patchwork-Id: 221411 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 285922C0077 for ; Tue, 19 Feb 2013 03:09:07 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755390Ab3BRQIm (ORCPT ); Mon, 18 Feb 2013 11:08:42 -0500 Received: from smtp-outbound-1.vmware.com ([208.91.2.12]:33426 "EHLO smtp-outbound-1.vmware.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754961Ab3BRQIL (ORCPT ); Mon, 18 Feb 2013 11:08:11 -0500 Received: from sc9-mailhost2.vmware.com (sc9-mailhost2.vmware.com [10.113.161.72]) by smtp-outbound-1.vmware.com (Postfix) with ESMTP id 4FB0A28ABA; Mon, 18 Feb 2013 08:08:11 -0800 (PST) Received: from vmware.com (promb-2s-dhcp87.eng.vmware.com [10.20.92.87]) by sc9-mailhost2.vmware.com (Postfix) with ESMTP id 3753EB083A; Mon, 18 Feb 2013 08:08:06 -0800 (PST) From: Andy King To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, virtualization@lists.linux-foundation.org Cc: davem@davemloft.net, pv-drivers@vmware.com, kraxel@redhat.com, Dmitry Torokhov Subject: [PATCH 2/4] VSOCK: get rid of vsock_version.h Date: Mon, 18 Feb 2013 08:04:11 -0800 Message-Id: <1361203453-1347-3-git-send-email-acking@vmware.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1361203453-1347-1-git-send-email-acking@vmware.com> References: <1361203453-1347-1-git-send-email-acking@vmware.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Dmitry Torokhov There isn't really a need to have a separate file for it. Acked-by: Andy King Signed-off-by: Dmitry Torokhov --- net/vmw_vsock/af_vsock.c | 3 +-- net/vmw_vsock/vsock_version.h | 22 ---------------------- 2 files changed, 1 insertions(+), 24 deletions(-) delete mode 100644 net/vmw_vsock/vsock_version.h diff --git a/net/vmw_vsock/af_vsock.c b/net/vmw_vsock/af_vsock.c index a8efe5a..c1b9e55 100644 --- a/net/vmw_vsock/af_vsock.c +++ b/net/vmw_vsock/af_vsock.c @@ -98,7 +98,6 @@ #include #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 4df7f5e..0000000 --- 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_ */