meta-ibm: Adjust mihawk's power sensor

1.Correct the channel of mihawk total power sensor
2.The current mihawk is not used to external gpu power.
  Avoid confusing users so delete this sensor.

(From meta-ibm rev: e65b464ca953a0d1a7db93598956db6aa2d306b9)

Change-Id: Ib4dee8181376d848364c9e92b2b5d2e67ec1fc17
Signed-off-by: Ben Pai <Ben_Pai@wistron.com>
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
index 5b347c1..94eeff7 100644
--- a/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
+++ b/meta-ibm/meta-witherspoon/recipes-phosphor/sensors/phosphor-hwmon/mihawk/obmc/hwmon/devices/platform/gpio-fsi/fsi-master/fsi0/slave@00--00/00--00--00--06/sbefifo1-dev0/occ-hwmon.1.conf
@@ -287,5 +287,4 @@
 LABEL_power8 = "fans_power"
 LABEL_power9 = "storage_b_power"
 LABEL_power10 = "storage_a_power"
-LABEL_power11 = "gpu0_power"
-LABEL_power14 = "total_power"
+LABEL_power15 = "total_power"