diff --git a/Makefile.fsm b/Makefile.fsm
index ab03cfc..869700a 100644
--- a/Makefile.fsm
+++ b/Makefile.fsm
@@ -7,6 +7,7 @@
 # List the files that belong to the driver in alphabetical order.
 #
 qca-nss-drv-objs := \
+			nss_bridge.o \
 			nss_capwap.o \
 			nss_cmn.o \
 			nss_core.o \
@@ -14,6 +15,7 @@
 			nss_crypto.o \
 			nss_dtls.o \
 			nss_dynamic_interface.o \
+			nss_edma.o \
 			nss_eth_rx.o \
 			nss_gre_redir.o \
 			nss_gre_tunnel.o \
@@ -34,9 +36,10 @@
 			nss_n2h.o \
 			nss_oam.o \
 			nss_phys_if.o \
-			nss_profiler.o \
 			nss_pm.o \
+			nss_profiler.o \
 			nss_portid.o \
+			nss_ppe.o \
 			nss_pppoe.o \
 			nss_pptp.o \
 			nss_shaper.o \
@@ -44,8 +47,10 @@
 			nss_stats.o \
 			nss_tstamp.o \
 			nss_tun6rd.o \
+			nss_trustsec_tx.o \
 			nss_tunipip6.o \
 			nss_virt_if.o \
+			nss_vlan.o \
 			nss_wifi.o \
 			nss_wifi_if.o \
 			nss_wifi_vdev.o
diff --git a/nss_hal/fsm9010/nss_hal_pvt.c b/nss_hal/fsm9010/nss_hal_pvt.c
index ce90c7d..62b65ee 100644
--- a/nss_hal/fsm9010/nss_hal_pvt.c
+++ b/nss_hal/fsm9010/nss_hal_pvt.c
@@ -1,6 +1,6 @@
 /*
  **************************************************************************
- * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2017, The Linux Foundation. All rights reserved.
  * Permission to use, copy, modify, and/or distribute this software for
  * any purpose with or without fee is hereby granted, provided that the
  * above copyright notice and this permission notice appear in all copies.
@@ -128,13 +128,13 @@
 	npd->nphys = res_nphys.start;
 	npd->vphys = res_vphys.start;
 
-	npd->nmap = (uint32_t)ioremap_nocache(npd->nphys, resource_size(&res_nphys));
+	npd->nmap = ioremap_nocache(npd->nphys, resource_size(&res_nphys));
 	if (!npd->nmap) {
 		nss_info_always("%p: nss%d: ioremap() fail for nphys\n", nss_ctx, nss_ctx->id);
 		goto out;
 	}
 
-	npd->vmap = (uint32_t)ioremap_nocache(npd->vphys, resource_size(&res_vphys));
+	npd->vmap = ioremap_nocache(npd->vphys, resource_size(&res_vphys));
 	if (!npd->vmap) {
 		nss_info_always("%p: nss%d: ioremap() fail for vphys\n", nss_ctx, nss_ctx->id);
 		goto out;
@@ -190,7 +190,7 @@
 /*
  * __nss_hal_core_reset()
  */
-static int __nss_hal_core_reset(struct platform_device *nss_dev, uint32_t map, uint32_t addr, uint32_t clk_src)
+static int __nss_hal_core_reset(struct platform_device *nss_dev, void __iomem *map, uint32_t addr, uint32_t clk_src)
 {
 	return 0;
 }