From 0de09d5a5ae6260e8cfb477173f5bc045d3d99e3 Mon Sep 17 00:00:00 2001 From: proski Date: Thu, 13 Dec 2007 02:00:00 +0000 Subject: [PATCH] Remove separate versions for ath_pci and wlan modules They are of no use, because they are not updated as the developmnet continues. It's better to have a single version for MadWifi. git-svn-id: http://madwifi-project.org/svn/madwifi/trunk@3039 0192ed92-7a03-0410-a25b-9323aeb14dbd --- ath/if_ath_ahb.c | 3 +-- ath/if_ath_pci.c | 3 +-- ath/version.h | 38 -------------------------------------- net80211/ieee80211_linux.c | 3 +-- net80211/version.h | 38 -------------------------------------- 5 files changed, 3 insertions(+), 82 deletions(-) delete mode 100644 ath/version.h delete mode 100644 net80211/version.h diff --git a/ath/if_ath_ahb.c b/ath/if_ath_ahb.c index f1d62ab..c72d535 100644 --- a/ath/if_ath_ahb.c +++ b/ath/if_ath_ahb.c @@ -306,9 +306,8 @@ static struct platform_driver ahb_wmac_driver = { /* * Module glue. */ -#include "version.h" #include "release.h" -static char *version = ATH_PCI_VERSION " (" RELEASE_VERSION ")"; +static char *version = RELEASE_VERSION; static char *dev_info = "ath_ahb"; #include diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c index 10b1348..08cbc74 100644 --- a/ath/if_ath_pci.c +++ b/ath/if_ath_pci.c @@ -343,9 +343,8 @@ static struct pci_driver ath_pci_drv_id = { /* * Module glue. */ -#include "version.h" #include "release.h" -static char *version = ATH_PCI_VERSION " (" RELEASE_VERSION ")"; +static char *version = RELEASE_VERSION; static char *dev_info = "ath_pci"; #include diff --git a/ath/version.h b/ath/version.h deleted file mode 100644 index 9c59e09..0000000 --- a/ath/version.h +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce at minimum a disclaimer - * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any - * redistribution must be conditioned upon including a substantially - * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGES. - * - * $Id$ - */ -#define ATH_PCI_VERSION "0.9.4.5" diff --git a/net80211/ieee80211_linux.c b/net80211/ieee80211_linux.c index f1b47ed..ee1baed 100644 --- a/net80211/ieee80211_linux.c +++ b/net80211/ieee80211_linux.c @@ -992,9 +992,8 @@ static struct notifier_block ieee80211_event_block = { /* * Module glue. */ -#include "version.h" #include "release.h" -static char *version = WLAN_VERSION " (" RELEASE_VERSION ")"; +static char *version = RELEASE_VERSION; static char *dev_info = "wlan"; MODULE_AUTHOR("Errno Consulting, Sam Leffler"); diff --git a/net80211/version.h b/net80211/version.h deleted file mode 100644 index b0d8823..0000000 --- a/net80211/version.h +++ /dev/null @@ -1,38 +0,0 @@ -/*- - * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer, - * without modification. - * 2. Redistributions in binary form must reproduce at minimum a disclaimer - * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any - * redistribution must be conditioned upon including a substantially - * similar Disclaimer requirement for further binary redistribution. - * 3. Neither the names of the above-listed copyright holders nor the names - * of any contributors may be used to endorse or promote products derived - * from this software without specific prior written permission. - * - * Alternatively, this software may be distributed under the terms of the - * GNU General Public License ("GPL") version 2 as published by the Free - * Software Foundation. - * - * NO WARRANTY - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY - * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL - * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, - * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER - * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGES. - * - * $Id$ - */ -#define WLAN_VERSION "0.8.4.2" -- 2.35.1