commit b20479460f970d96702a09739edcd2533871728f
Author: Jiri Slaby <ku@bellona.localdomain>
Date:   Mon Jun 18 09:46:30 2007 +0200

    little ath_pci cleanup

diff --git a/ath/if_ath_pci.c b/ath/if_ath_pci.c
index c5a7d24..e946fcf 100644
--- a/ath/if_ath_pci.c
+++ b/ath/if_ath_pci.c
@@ -21,41 +21,18 @@
  * 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: if_ath_pci.c 2408 2007-05-30 22:58:20Z mickflemm $
  */
-#include "opt_ah.h"
+#define	ATH_PCI_VERSION	"0.9.5.0-BSD"
 
-#ifndef EXPORT_SYMTAB
-#define	EXPORT_SYMTAB
-#endif
+#include "opt_ah.h"
 
-#ifndef AUTOCONF_INCLUDED
-#include <linux/config.h>
-#endif
 #include <linux/version.h>
 #include <linux/module.h>
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,0))
-#include <linux/moduleparam.h>
-#endif
-#include <linux/init.h>
 #include <linux/if.h>
 #include <linux/netdevice.h>
 #include <linux/cache.h>
-
 #include <linux/pci.h>
+#include <linux/ethtool.h>
 
 #include <asm/uaccess.h>
 
@@ -64,22 +41,9 @@
 
 /* support for module parameters */
 static char *ifname = "ath";
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,52))
-MODULE_PARM(ifname, "s");
-#else
 module_param(ifname, charp, 0);
-#endif
-
 MODULE_PARM_DESC(ifname, "Interface name prefix (default: ath)");
 
-#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0))
-/*
- * PCI initialization uses Linux 2.4.x version and
- * older kernels do not support this
- */
-#error Atheros PCI version requires at least Linux kernel version 2.4.0
-#endif /* kernel < 2.4.0 */
-
 struct ath_pci_softc {
 	struct ath_softc	aps_sc;
 #ifdef CONFIG_PM
@@ -324,12 +288,9 @@ static struct pci_driver ath_pci_drv_id = {
 /*
  * Module glue.
  */
-#include "version.h"
 static char *version = ATH_PCI_VERSION " (EXPERIMENTAL)";
 static char *dev_info = "ath_pci";
 
-#include <linux/ethtool.h>
-
 int
 ath_ioctl_ethtool(struct ath_softc *sc, int cmd, void __user *addr)
 {
diff --git a/ath/version.h b/ath/version.h
deleted file mode 100644
index 04b690c..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: version.h 844 2005-02-16 14:20:31Z togg $
- */
-#define	ATH_PCI_VERSION	"0.9.5.0-BSD"