From 1c7fb9c767b968773d317fe1a2f9256ccd61c29a Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 10 May 2016 07:11:09 +0000 Subject: sfxge(4): remove EFSYS_OPT_MON_NULL Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. MFC after: 1 week --- sys/dev/sfxge/common/efx_check.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'sys/dev/sfxge/common/efx_check.h') diff --git a/sys/dev/sfxge/common/efx_check.h b/sys/dev/sfxge/common/efx_check.h index 62bd90952666..2aa7b7cb45a9 100644 --- a/sys/dev/sfxge/common/efx_check.h +++ b/sys/dev/sfxge/common/efx_check.h @@ -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_MON_NULL (0) - #define EFSYS_OPT_NVRAM_FALCON_BOOTROM (0) #define EFSYS_OPT_NVRAM_SFT9001 (0) #define EFSYS_OPT_NVRAM_SFX7101 (0) @@ -170,12 +168,9 @@ # error "MON_MAX6647 is obsolete and is not supported." #endif -/* Support null monitor */ -#if EFSYS_OPT_MON_NULL -# if !EFSYS_OPT_FALCON -# error "MON_NULL requires FALCON" -# endif -#endif /* EFSYS_OPT_MON_NULL */ +#ifdef EFSYS_OPT_MON_NULL +# error "MON_NULL is obsolete and is not supported." +#endif /* Obsolete option */ #ifdef EFSYS_OPT_MON_SIENA -- cgit v1.2.3