aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rybchenko <arybchik@FreeBSD.org>2016-12-29 07:10:25 +0000
committerAndrew Rybchenko <arybchik@FreeBSD.org>2016-12-29 07:10:25 +0000
commitecd9d64f0d6fefb268794487f4f6cd940b4c4574 (patch)
treede8869efc464eb99f770bd6bc69b4cced078be4a
parent19734dbb1eb1376d7f20175006f1505664a9cf6b (diff)
sfxge(4): delete hunt_phy.c
Submitted by: Mark Spender <mspender at solarflare.com> Sponsored by: Solarflare Communications, Inc. MFC after: 2 days
Notes
Notes: svn path=/head/; revision=310758
-rw-r--r--sys/conf/files.amd641
-rw-r--r--sys/dev/sfxge/common/hunt_phy.c39
-rw-r--r--sys/modules/sfxge/Makefile2
3 files changed, 1 insertions, 41 deletions
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index a3cb9f94235e..14c639e54b92 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -385,7 +385,6 @@ dev/sfxge/common/efx_tx.c optional sfxge pci
dev/sfxge/common/efx_vpd.c optional sfxge pci
dev/sfxge/common/efx_wol.c optional sfxge pci
dev/sfxge/common/hunt_nic.c optional sfxge pci
-dev/sfxge/common/hunt_phy.c optional sfxge pci
dev/sfxge/common/mcdi_mon.c optional sfxge pci
dev/sfxge/common/medford_nic.c optional sfxge pci
dev/sfxge/common/siena_mac.c optional sfxge pci
diff --git a/sys/dev/sfxge/common/hunt_phy.c b/sys/dev/sfxge/common/hunt_phy.c
deleted file mode 100644
index 5d81b592e2d8..000000000000
--- a/sys/dev/sfxge/common/hunt_phy.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * Copyright (c) 2012-2016 Solarflare Communications Inc.
- * 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.
- * 2. Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * 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 MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 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 DAMAGE.
- *
- * The views and conclusions contained in the software and documentation are
- * those of the authors and should not be interpreted as representing official
- * policies, either expressed or implied, of the FreeBSD Project.
- */
-
-#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
-
-#include "efx.h"
-#include "efx_impl.h"
-
-#if EFSYS_OPT_HUNTINGTON
-
-#endif /* EFSYS_OPT_HUNTINGTON */
diff --git a/sys/modules/sfxge/Makefile b/sys/modules/sfxge/Makefile
index b30d532c5eb4..5770eaa529de 100644
--- a/sys/modules/sfxge/Makefile
+++ b/sys/modules/sfxge/Makefile
@@ -33,7 +33,7 @@ SRCS+= ef10_ev.c ef10_filter.c ef10_intr.c ef10_mac.c ef10_mcdi.c ef10_nic.c
SRCS+= ef10_nvram.c ef10_phy.c ef10_rx.c ef10_tx.c ef10_vpd.c
SRCS+= ef10_impl.h
-SRCS+= hunt_nic.c hunt_phy.c
+SRCS+= hunt_nic.c
SRCS+= hunt_impl.h
SRCS+= medford_nic.c