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

Commit e00cf3b9 authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'master' of... 

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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-agn-tx.c
	net/mac80211/sta_info.h
parents 1a8218e9 3b8ab88a

Documentation/ABI/testing/sysfs-bus-bcma

0 → 100644
+31 −0
Original line number Diff line number Diff line 
What:		/sys/bus/bcma/devices/.../manuf

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		Each BCMA core has it's manufacturer id. See

		include/linux/bcma/bcma.h for possible values.



What:		/sys/bus/bcma/devices/.../id

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		There are a few types of BCMA cores, they can be identified by

		id field.



What:		/sys/bus/bcma/devices/.../rev

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		BCMA cores of the same type can still slightly differ depending

		on their revision. Use it for detailed programming.



What:		/sys/bus/bcma/devices/.../class

Date:		May 2011

KernelVersion:	2.6.40

Contact:	Rafał Miłecki <zajec5@gmail.com>

Description:

		Each BCMA core is identified by few fields, including class it

		belongs to. See include/linux/bcma/bcma.h for possible values.

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -5812,6 +5812,13 @@ S: Maintained 
F:	drivers/ssb/

F:	include/linux/ssb/



BROADCOM SPECIFIC AMBA DRIVER (BCMA)

M:	Rafał Miłecki <zajec5@gmail.com>

L:	linux-wireless@vger.kernel.org

S:	Maintained

F:	drivers/bcma/

F:	include/linux/bcma/



SONY VAIO CONTROL DEVICE DRIVER

M:	Mattia Dongili <malattia@linux.it>

L:	platform-driver-x86@vger.kernel.org

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ source "drivers/watchdog/Kconfig" 


source "drivers/ssb/Kconfig"



source "drivers/bcma/Kconfig"



source "drivers/mfd/Kconfig"



source "drivers/regulator/Kconfig"

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ obj-$(CONFIG_HID) += hid/ 
obj-$(CONFIG_PPC_PS3)		+= ps3/

obj-$(CONFIG_OF)		+= of/

obj-$(CONFIG_SSB)		+= ssb/

obj-$(CONFIG_BCMA)		+= bcma/

obj-$(CONFIG_VHOST_NET)		+= vhost/

obj-$(CONFIG_VLYNQ)		+= vlynq/

obj-$(CONFIG_STAGING)		+= staging/

drivers/bcma/Kconfig

0 → 100644
+33 −0
Original line number Diff line number Diff line 
config BCMA_POSSIBLE

	bool

	depends on HAS_IOMEM && HAS_DMA

	default y



menu "Broadcom specific AMBA"

	depends on BCMA_POSSIBLE



config BCMA

	tristate "BCMA support"

	depends on BCMA_POSSIBLE

	help

	  Bus driver for Broadcom specific Advanced Microcontroller Bus

	  Architecture.



config BCMA_HOST_PCI_POSSIBLE

	bool

	depends on BCMA && PCI = y

	default y



config BCMA_HOST_PCI

	bool "Support for BCMA on PCI-host bus"

	depends on BCMA_HOST_PCI_POSSIBLE



config BCMA_DEBUG

	bool "BCMA debugging"

	depends on BCMA

	help

	  This turns on additional debugging messages.



	  If unsure, say N



endmenu