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

Commit 60717f7e authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6

parents fbabbed8 2d8d4fdf

drivers/net/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -2368,6 +2368,7 @@ config GELIC_NET 
config GELIC_WIRELESS

config GELIC_WIRELESS

       bool "PS3 Wireless support"

       bool "PS3 Wireless support"

       depends on GELIC_NET

       depends on GELIC_NET

       select WIRELESS_EXT

       help

       help

        This option adds the support for the wireless feature of PS3.

        This option adds the support for the wireless feature of PS3.

        If you have the wireless-less model of PS3 or have no plan to

        If you have the wireless-less model of PS3 or have no plan to

drivers/net/ps3_gelic_wireless.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -2690,6 +2690,7 @@ int gelic_wl_driver_probe(struct gelic_card *card) 
		return -ENOMEM;

		return -ENOMEM;





	/* setup net_device structure */

	/* setup net_device structure */

	SET_NETDEV_DEV(netdev, &card->dev->core);

	gelic_wl_setup_netdev_ops(netdev);

	gelic_wl_setup_netdev_ops(netdev);





	/* setup some of net_device and register it */

	/* setup some of net_device and register it */

drivers/net/wireless/b43/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ config B43_PCI_AUTOSELECT 
	bool

	bool

	depends on B43 && SSB_PCIHOST_POSSIBLE

	depends on B43 && SSB_PCIHOST_POSSIBLE

	select SSB_PCIHOST

	select SSB_PCIHOST

	select SSB_B43_PCI_BRIDGE

	default y

	default y





# Auto-select SSB PCICORE driver, if possible

# Auto-select SSB PCICORE driver, if possible

drivers/net/wireless/b43legacy/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -25,6 +25,7 @@ config B43LEGACY_PCI_AUTOSELECT 
	bool

	bool

	depends on B43LEGACY && SSB_PCIHOST_POSSIBLE

	depends on B43LEGACY && SSB_PCIHOST_POSSIBLE

	select SSB_PCIHOST

	select SSB_PCIHOST

	select SSB_B43_PCI_BRIDGE

	default y

	default y





# Auto-select SSB PCICORE driver, if possible

# Auto-select SSB PCICORE driver, if possible

drivers/net/wireless/bcm43xx/Kconfig

+1 −1
Original line number Original line Diff line number Diff line 
config BCM43XX

config BCM43XX

	tristate "Broadcom BCM43xx wireless support (DEPRECATED)"

	tristate "Broadcom BCM43xx wireless support (DEPRECATED)"

	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && EXPERIMENTAL

	depends on PCI && IEEE80211 && IEEE80211_SOFTMAC && WLAN_80211 && (!SSB_B43_PCI_BRIDGE || SSB != y) && EXPERIMENTAL

	select WIRELESS_EXT

	select WIRELESS_EXT

	select FW_LOADER

	select FW_LOADER

	select HW_RANDOM

	select HW_RANDOM