Update for bms modularity

Bug: 160835098
Change-Id: I885c422e23bf2c7fcb42b5c8b6c9a47f76b964d5
Signed-off-by: Ken Tsou <[email protected]>
diff --git a/max1720x_battery.c b/max1720x_battery.c
index ad85039..bfcdee1 100644
--- a/max1720x_battery.c
+++ b/max1720x_battery.c
@@ -33,9 +33,9 @@
 #include <linux/device.h>
 #include <linux/fs.h> /* register_chrdev, unregister_chrdev */
 #include <linux/seq_file.h> /* seq_read, seq_lseek, single_release */
-#include <google/google_bms.h>
-#include <google/logbuffer.h>
-#include "google/max1720x_battery.h"
+#include "google_bms.h"
+#include "logbuffer.h"
+#include "max1720x_battery.h"
 
 #include <linux/debugfs.h>
 
@@ -53,9 +53,9 @@
 
 #define HISTORY_DEVICENAME "maxfg_history"
 
-#include "google/max1720x.h"
-#include "google/max1730x.h"
-#include "google/max_m5.h"
+#include "max1720x.h"
+#include "max1730x.h"
+#include "max_m5.h"
 
 enum max17xxx_register {
 	MAX17XXX_COMMAND	= MAX1720X_COMMAND,
@@ -3901,7 +3901,7 @@
 		return 0;
 	}
 
-	chip->secondary = i2c_new_secondary_device(chip->primary,
+	chip->secondary = i2c_new_ancillary_device(chip->primary,
 						   "nvram",
 						   secondary_address);
 	if (chip->secondary == NULL) {