From: Pierre-Alexandre Meyer <pierre@mouraf.org>
Date: Mon, 23 Mar 2009 07:00:52 +0000 (-0700)
Subject: hdt: Fixing merge
X-Git-Tag: syslinux-3.80-pre1~66
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8bcaa0c3871d2caadbe4c6417270b27f5c36d528;p=profile%2Fivi%2Fsyslinux.git

hdt: Fixing merge

Impact: Fix the build.

The previous merge seems to have gone wrong. Fixing it.

Signed-off-by: Pierre-Alexandre Meyer <pierre@mouraf.org>
---

diff --git a/com32/hdt/hdt-cli-dmi.c b/com32/hdt/hdt-cli-dmi.c
index 8a922f1..d5cc6f1 100644
--- a/com32/hdt/hdt-cli-dmi.c
+++ b/com32/hdt/hdt-cli-dmi.c
@@ -59,7 +59,7 @@ static void show_dmi_modules(int argc __unused, char** argv __unused,
 		printf("\t%s\n", CLI_DMI_PROCESSOR);
 	if (hardware->dmi.system.filled == true)
 		printf("\t%s\n", CLI_DMI_SYSTEM);
-  	if (hardware->dmi.ipmifilled == true)
+  	if (hardware->dmi.ipmi.filled == true)
 		printf("\t%s\n", CLI_DMI_IPMI);
 }
 
@@ -190,7 +190,7 @@ static void show_dmi_chassis(int argc __unused, char** argv __unused,
         hardware->dmi.chassis.nb_power_cords);
 }
 
-static void show_dmi_ipmi(int argc, char** argv,
+static void show_dmi_ipmi(int argc __unused, char **argv __unused,
                              struct s_hardware *hardware)
 {
   if (hardware->dmi.ipmi.filled == false) {
@@ -216,7 +216,7 @@ static void show_dmi_ipmi(int argc, char** argv,
         hardware->dmi.ipmi.irq);
 }
 
-static void show_dmi_battery(int argc, char** argv,
+static void show_dmi_battery(int argc __unused, char** argv __unused,
                              struct s_hardware *hardware)
 {
   if (hardware->dmi.battery.filled == false) {
@@ -375,7 +375,7 @@ void main_show_dmi(int argc __unused, char **argv __unused,
   show_dmi_modules(0, NULL, hardware);
 }
 
-void show_dmi_memory_modules(int argc, char** argv,
+void show_dmi_memory_modules(int argc __unused, char** argv __unused,
                              struct s_hardware *hardware)
 {
   int clear = 1, show_free_banks = 1;
diff --git a/com32/hdt/hdt-cli.c b/com32/hdt/hdt-cli.c
index 353b3e0..f98ab76 100644
--- a/com32/hdt/hdt-cli.c
+++ b/com32/hdt/hdt-cli.c
@@ -603,4 +603,3 @@ void start_cli_mode(struct s_hardware *hardware)
 		}
 	}
 }
-}