svn commit: r299321 - head/sys/dev/sfxge/common

[Andrew Rybchenko]

Author: arybchik
Date: Tue May 10 07:02:59 2016
New Revision: 299321
URL: https://svnweb.freebsd.org/changeset/base/299321

Log:
  sfxge(4): remove EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE
  
  Submitted by:   Andy Moreton <amoreton at solarflare.com>
  Sponsored by:   Solarflare Communications, Inc.
  MFC after:      1 week

Modified:
  head/sys/dev/sfxge/common/efx_check.h

Modified: head/sys/dev/sfxge/common/efx_check.h
==============================================================================
--- head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:01:06 2016	(r299320)
+++ head/sys/dev/sfxge/common/efx_check.h	Tue May 10 07:02:59 2016	(r299321)
@@ -47,8 +47,6 @@
 # error "FALCON is obsolete and is not supported."
 #else
 /* FIXME: remove this after Falcon support has been removed */
-#define	EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE	(0)
-
 #define	EFSYS_OPT_MAC_FALCON_GMAC		(0)
 #define	EFSYS_OPT_MAC_FALCON_XMAC		(0)
 
@@ -103,12 +101,9 @@
 # endif
 #endif /* EFSYS_OPT_EV_PREFETCH */
 
-/* Support overriding the NVRAM and VPD configuration */
-#if EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE
-# if !EFSYS_OPT_FALCON
-#  error "FALCON_NIC_CFG_OVERRIDE requires FALCON"
-# endif
-#endif /* EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE */
+#ifdef EFSYS_OPT_FALCON_NIC_CFG_OVERRIDE
+# error "FALCON_NIC_CFG_OVERRIDE is obsolete and is not supported."
+#endif
 
 /* Support hardware packet filters */
 #if EFSYS_OPT_FILTER