diff --git a/drivers/net/wireless/cnss/Makefile b/drivers/net/wireless/cnss/Makefile
index c1ca4c3821e6..567ef214d7dd 100644
--- a/drivers/net/wireless/cnss/Makefile
+++ b/drivers/net/wireless/cnss/Makefile
@@ -3,7 +3,9 @@
 # Makefile for CNSS platform driver
 #
 
-obj-$(CONFIG_CNSS_PCI)	+= cnss_pci.o
-obj-$(CONFIG_CNSS_SDIO)	+= cnss_sdio.o
-obj-$(CONFIG_CNSS)	+= cnss_common.o
-obj-$(CONFIG_CNSS_LOGGER)	+= logger/
+obj-$(CONFIG_CNSS) += cnss.o
+
+cnss-$(CONFIG_CNSS_PCI)  += cnss_pci.o
+cnss-$(CONFIG_CNSS_SDIO) += cnss_sdio.o
+cnss-y      += cnss_common.o
+obj-$(CONFIG_CNSS_LOGGER)       += logger/
diff --git a/include/net/cnss.h b/include/net/cnss.h
index 9c99bdc2032d..77bc3157c2aa 100644
--- a/include/net/cnss.h
+++ b/include/net/cnss.h
@@ -10,7 +10,6 @@
 #include <linux/mmc/sdio_func.h>
 #include <linux/interrupt.h>
 
-#ifdef CONFIG_CNSS
 #define MAX_FIRMWARE_SIZE (1 * 1024 * 1024)
 #define CNSS_MAX_FILE_NAME	20
 #define PINCTRL_SLEEP  0
@@ -177,7 +176,6 @@ int cnss_pm_runtime_request(struct device *dev, enum
 			    cnss_runtime_request request);
 void cnss_set_cc_source(enum cnss_cc_src cc_source);
 enum cnss_cc_src cnss_get_cc_source(void);
-#endif
 
 void cnss_pm_wake_lock_init(struct wakeup_source **ws, const char *name);
 void cnss_pm_wake_lock(struct wakeup_source *ws);