From d9b66edc7e283775753e5d31487cf41a2ed7fb44 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Tue, 10 May 2016 07:13:45 +0000 Subject: [PATCH] sfxge(4): remove EFSYS_OPT_NVRAM_SFT9001 Submitted by: Andy Moreton Sponsored by: Solarflare Communications, Inc. MFC after: 1 week --- sys/dev/sfxge/common/efx_check.h | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/sys/dev/sfxge/common/efx_check.h b/sys/dev/sfxge/common/efx_check.h index 3d99516d559..9761fa0c97f 100644 --- a/sys/dev/sfxge/common/efx_check.h +++ b/sys/dev/sfxge/common/efx_check.h @@ -47,7 +47,6 @@ # error "FALCON is obsolete and is not supported." #else /* FIXME: remove this after Falcon support has been removed */ -#define EFSYS_OPT_NVRAM_SFT9001 (0) #define EFSYS_OPT_NVRAM_SFX7101 (0) #define EFSYS_OPT_PHY_NULL (0) @@ -215,15 +214,9 @@ # error "NVRAM_FALCON_BOOTROM is obsolete and is not supported." #endif -/* Support NVRAM config for SFT9001 */ -#if EFSYS_OPT_NVRAM_SFT9001 -# if !EFSYS_OPT_NVRAM -# error "NVRAM_SFT9001 requires NVRAM" -# endif -# if !EFSYS_OPT_FALCON -# error "NVRAM_SFT9001 requires FALCON" -# endif -#endif /* EFSYS_OPT_NVRAM_SFT9001 */ +#ifdef EFSYS_OPT_NVRAM_SFT9001 +# error "NVRAM_SFT9001 is obsolete and is not supported." +#endif /* Support NVRAM config for SFX7101 */ #if EFSYS_OPT_NVRAM_SFX7101