[Acx100-devel] [PATCH 17/27] cleanup: minor tweak to NONESSENTIAL_FEATURES

[Jim C. <jim...@gm...>]

Signed-off-by: Jim Cromie <jim...@gm...>
---
 acx.h   |    4 +++-
 merge.c |    4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/acx.h b/acx.h
index 492d789..5550efc 100644
--- a/acx.h
+++ b/acx.h
@@ -18,7 +18,9 @@
 #ifndef _ACX_H_
 #define _ACX_H_
 
-#define NONESSENTIAL_FEATURES 1
+#define NONESSENTIAL_FEATURES 1	// acx_show_card_eeprom_id()
+//#define UNUSED 0		// lots of errs ifdefd
+//#define CONFIG_PM 0		// in include/generated/autoconf.h
 
 #include "acx_compat.h"
 #include "acx_config.h"
diff --git a/merge.c b/merge.c
index 42b1f01..bacaa6b 100644
--- a/merge.c
+++ b/merge.c
@@ -1446,6 +1446,8 @@ void acx_show_card_eeprom_id(acx_device_t *adev)
 	}
 	FN_EXIT0;
 }
+#else
+static inline void acx_show_card_eeprom_id(acx_device_t *adev) {}
 #endif /* NONESSENTIAL_FEATURES */
 
 /*
@@ -4689,9 +4691,7 @@ static int __devinit acxmem_probe(struct platform_device *pdev) {
 	 * to unconfigured interface (ifup) */
 	adev->mgmt_timer.function = (void(*)(unsigned long)) 0x0000dead;
 
-#if defined(NONESSENTIAL_FEATURES)
 	acx_show_card_eeprom_id(adev);
-#endif /* NONESSENTIAL_FEATURES */
 
 	/* Device setup is finished, now start initializing the card */
 	// ---
-- 
1.7.8.1