Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ebccd33e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: cnss: Adjust probe sequence"

parents 1c8918ce 2d8d72df

drivers/net/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ obj-$(CONFIG_CAIF) += caif/ 
obj-$(CONFIG_CAN) += can/

obj-$(CONFIG_CAN) += can/

obj-$(CONFIG_ETRAX_ETHERNET) += cris/

obj-$(CONFIG_ETRAX_ETHERNET) += cris/

obj-$(CONFIG_NET_DSA) += dsa/

obj-$(CONFIG_NET_DSA) += dsa/

obj-$(CONFIG_ETHERNET) += ethernet/

obj-$(CONFIG_FDDI) += fddi/

obj-$(CONFIG_FDDI) += fddi/

obj-$(CONFIG_HIPPI) += hippi/

obj-$(CONFIG_HIPPI) += hippi/

obj-$(CONFIG_HAMRADIO) += hamradio/

obj-$(CONFIG_HAMRADIO) += hamradio/
@@ -54,6 +53,7 @@ obj-$(CONFIG_NET_SB1000) += sb1000.o 
obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o

obj-$(CONFIG_SUNGEM_PHY) += sungem_phy.o

obj-$(CONFIG_WAN) += wan/

obj-$(CONFIG_WAN) += wan/

obj-$(CONFIG_WLAN) += wireless/

obj-$(CONFIG_WLAN) += wireless/

obj-$(CONFIG_ETHERNET) += ethernet/

obj-$(CONFIG_WIMAX) += wimax/

obj-$(CONFIG_WIMAX) += wimax/

obj-$(CONFIG_IEEE802154) += ieee802154/

obj-$(CONFIG_IEEE802154) += ieee802154/

drivers/net/wireless/cnss/cnss_pci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -3840,7 +3840,7 @@ int cnss_pcie_power_down(struct device *dev) 
	return ret;

	return ret;

}

}





module_init(cnss_initialize);

fs_initcall(cnss_initialize);

module_exit(cnss_exit);

module_exit(cnss_exit);





MODULE_LICENSE("GPL v2");

MODULE_LICENSE("GPL v2");