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

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

Merge tag 'wireless-drivers-for-davem-2018-05-22' of... 

Merge tag 'wireless-drivers-for-davem-2018-05-22' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 4.17

Hopefully the last fixes for 4.17. ssb is again causing problems so we
had to revert a commit and fix it better. Also a small fix to bcma and
some MAINTAINERS file updates.

ssb

* fix regression with all module PCI cards, for example using b43 and
  b44 drivers

* try again fixing a MIPS linker error

bcma

* fix truncated info log messages
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 2f3ab622 813477aa

MAINTAINERS

+4 −4
Original line number Diff line number Diff line
@@ -2332,7 +2332,7 @@ F: drivers/gpio/gpio-ath79.c 
F:	Documentation/devicetree/bindings/gpio/gpio-ath79.txt



ATHEROS ATH GENERIC UTILITIES

M:	"Luis R. Rodriguez" <mcgrof@do-not-panic.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	linux-wireless@vger.kernel.org

S:	Supported

F:	drivers/net/wireless/ath/*
@@ -2347,7 +2347,7 @@ S: Maintained 
F:	drivers/net/wireless/ath/ath5k/



ATHEROS ATH6KL WIRELESS DRIVER

M:	Kalle Valo <kvalo@qca.qualcomm.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	linux-wireless@vger.kernel.org

W:	http://wireless.kernel.org/en/users/Drivers/ath6kl

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@ -11632,7 +11632,7 @@ S: Maintained 
F:	drivers/media/tuners/qt1010*



QUALCOMM ATHEROS ATH10K WIRELESS DRIVER

M:	Kalle Valo <kvalo@qca.qualcomm.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	ath10k@lists.infradead.org

W:	http://wireless.kernel.org/en/users/Drivers/ath10k

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
@@ -11683,7 +11683,7 @@ S: Maintained 
F:	drivers/media/platform/qcom/venus/



QUALCOMM WCN36XX WIRELESS DRIVER

M:	Eugene Krasnikov <k.eugene.e@gmail.com>

M:	Kalle Valo <kvalo@codeaurora.org>

L:	wcn36xx@lists.infradead.org

W:	http://wireless.kernel.org/en/users/Drivers/wcn36xx

T:	git git://github.com/KrasnikovEugene/wcn36xx.git

drivers/bcma/driver_mips.c

+1 −1
Original line number Diff line number Diff line
@@ -184,7 +184,7 @@ static void bcma_core_mips_print_irq(struct bcma_device *dev, unsigned int irq) 
{

	int i;

	static const char *irq_name[] = {"2(S)", "3", "4", "5", "6", "D", "I"};

	char interrupts[20];

	char interrupts[25];

	char *ints = interrupts;



	for (i = 0; i < ARRAY_SIZE(irq_name); i++)

drivers/ssb/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ config SSB_SERIAL 


config SSB_DRIVER_PCICORE_POSSIBLE

	bool

	depends on SSB_PCIHOST && SSB = y

	depends on SSB_PCIHOST

	default y



config SSB_DRIVER_PCICORE
@@ -131,7 +131,7 @@ config SSB_DRIVER_PCICORE 


config SSB_PCICORE_HOSTMODE

	bool "Hostmode support for SSB PCI core"

	depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS

	depends on SSB_DRIVER_PCICORE && SSB_DRIVER_MIPS && SSB = y

	help

	  PCIcore hostmode operation (external PCI bus).