[Acx100-devel] [PATCH 12/19] merge: stick with mem.c:acxmem_proc_diag_output

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

Merge of acx(mem|pci)_proc_diag_output is rather ugly,
lets defer it for now.  Remove #if0d code separately.

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

diff --git a/mem.c b/mem.c
index 68706cb..76e69d4 100644
--- a/mem.c
+++ b/mem.c
@@ -835,7 +835,7 @@ STATick void acxmem_i_set_multicast_list(struct net_device *ndev)
  * BOM Proc, Debug
  * ==================================================
  */
-#if 0 // copied to merge, but needs work
+#if 1 // copied to merge, but needs work
 int acxmem_proc_diag_output(struct seq_file *file,
 			acx_device_t *adev)
 {
diff --git a/merge.c b/merge.c
index 152aac3..dd6f95d 100644
--- a/merge.c
+++ b/merge.c
@@ -2200,7 +2200,7 @@ static void acxmem_i_set_multicast_list(struct net_device *ndev)
  * BOM Proc, Debug
  * ==================================================
  */
-#if 1 // real close
+#if 0 // real close
 int acxmem_proc_diag_output(struct seq_file *file,
 			acx_device_t *adev)
 {
-- 
1.7.10.1.487.ga3935e6