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

Commit d90ce871 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 

* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6:
  Staging: comedi: fix build breakages on some platforms
  Staging: brcm80211: disable drivers except for X86 or MIPS platforms
  Staging: brcm80211: disable drivers for PPC platforms
  Staging: iio: Make IIO depend on GENERIC_HARDIRQS
  Staging: mei: fix suspend failure
  Staging: fix iio builds when IIO_RING_BUFFER is not enabled
  Staging: Comedi: Build only on arches providing PAGE_KERNEL_NOCACHE
  Staging: fix more iio builds when IIO_RING_BUFFER is not enabled
parents 505cb6bc a73738e9

drivers/staging/brcm80211/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ config BRCMSMAC 
	default n

	depends on PCI

	depends on WLAN && MAC80211

	depends on X86 || MIPS

	select BRCMUTIL

	select FW_LOADER

	select CRC_CCITT
@@ -20,6 +21,7 @@ config BRCMFMAC 
	default n

	depends on MMC

	depends on WLAN && CFG80211

	depends on X86 || MIPS

	select BRCMUTIL

	select FW_LOADER

	select WIRELESS_EXT

drivers/staging/comedi/Kconfig

+22 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config COMEDI 
	tristate "Data acquisition support (comedi)"

	default N

	depends on m

	depends on BROKEN || FRV || M32R || MN10300 || SUPERH || TILE || X86

	---help---

	  Enable support a wide range of data acquisition devices

	  for Linux.
@@ -160,6 +161,7 @@ config COMEDI_PCL730 


config COMEDI_PCL812

	tristate "Advantech PCL-812/813 and ADlink ACL-8112/8113/8113/8216"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for Advantech PCL-812/PG, PCL-813/B, ADLink
@@ -171,6 +173,7 @@ config COMEDI_PCL812 


config COMEDI_PCL816

	tristate "Advantech PCL-814 and PCL-816 ISA card support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for Advantech PCL-814 and PCL-816 ISA cards
@@ -180,6 +183,7 @@ config COMEDI_PCL816 


config COMEDI_PCL818

	tristate "Advantech PCL-718 and PCL-818 ISA card support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for Advantech PCL-818 ISA cards
@@ -269,6 +273,7 @@ config COMEDI_DAS800 


config COMEDI_DAS1800

	tristate "DAS1800 and compatible ISA card support"

	depends on VIRT_TO_BUS

	select COMEDI_FC

	default N

	---help---
@@ -340,6 +345,7 @@ config COMEDI_DT2817 
config COMEDI_DT282X

	tristate "Data Translation DT2821 series and DT-EZ ISA card support"

	select COMEDI_FC

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for Data Translation DT2821 series including DT-EZ
@@ -419,6 +425,7 @@ config COMEDI_ADQ12B 
config COMEDI_NI_AT_A2150

	tristate "NI AT-A2150 ISA card support"

	depends on COMEDI_NI_COMMON

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for National Instruments AT-A2150 cards
@@ -536,6 +543,7 @@ if COMEDI_PCI_DRIVERS && PCI 


config COMEDI_ADDI_APCI_035

	tristate "ADDI-DATA APCI_035 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_035 cards
@@ -545,6 +553,7 @@ config COMEDI_ADDI_APCI_035 


config COMEDI_ADDI_APCI_1032

	tristate "ADDI-DATA APCI_1032 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_1032 cards
@@ -554,6 +563,7 @@ config COMEDI_ADDI_APCI_1032 


config COMEDI_ADDI_APCI_1500

	tristate "ADDI-DATA APCI_1500 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_1500 cards
@@ -563,6 +573,7 @@ config COMEDI_ADDI_APCI_1500 


config COMEDI_ADDI_APCI_1516

	tristate "ADDI-DATA APCI_1516 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_1516 cards
@@ -572,6 +583,7 @@ config COMEDI_ADDI_APCI_1516 


config COMEDI_ADDI_APCI_1564

	tristate "ADDI-DATA APCI_1564 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_1564 cards
@@ -581,6 +593,7 @@ config COMEDI_ADDI_APCI_1564 


config COMEDI_ADDI_APCI_16XX

	tristate "ADDI-DATA APCI_16xx support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_16xx cards
@@ -590,6 +603,7 @@ config COMEDI_ADDI_APCI_16XX 


config COMEDI_ADDI_APCI_2016

	tristate "ADDI-DATA APCI_2016 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_2016 cards
@@ -599,6 +613,7 @@ config COMEDI_ADDI_APCI_2016 


config COMEDI_ADDI_APCI_2032

	tristate "ADDI-DATA APCI_2032 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_2032 cards
@@ -608,6 +623,7 @@ config COMEDI_ADDI_APCI_2032 


config COMEDI_ADDI_APCI_2200

	tristate "ADDI-DATA APCI_2200 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_2200 cards
@@ -617,6 +633,7 @@ config COMEDI_ADDI_APCI_2200 


config COMEDI_ADDI_APCI_3001

	tristate "ADDI-DATA APCI_3001 support"

	depends on VIRT_TO_BUS

	select COMEDI_FC

	default N

	---help---
@@ -627,6 +644,7 @@ config COMEDI_ADDI_APCI_3001 


config COMEDI_ADDI_APCI_3120

	tristate "ADDI-DATA APCI_3520 support"

	depends on VIRT_TO_BUS

	select COMEDI_FC

	default N

	---help---
@@ -637,6 +655,7 @@ config COMEDI_ADDI_APCI_3120 


config COMEDI_ADDI_APCI_3501

	tristate "ADDI-DATA APCI_3501 support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_3501 cards
@@ -646,6 +665,7 @@ config COMEDI_ADDI_APCI_3501 


config COMEDI_ADDI_APCI_3XXX

	tristate "ADDI-DATA APCI_3xxx support"

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADDI-DATA APCI_3xxx cards
@@ -712,6 +732,7 @@ config COMEDI_ADL_PCI9111 
config COMEDI_ADL_PCI9118

	tristate "ADLink PCI-9118DG, PCI-9118HG, PCI-9118HR support"

	select COMEDI_FC

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for ADlink PCI-9118DG, PCI-9118HG, PCI-9118HR cards
@@ -1287,6 +1308,7 @@ config COMEDI_NI_LABPC 
	depends on COMEDI_MITE

	select COMEDI_8255

	select COMEDI_FC

	depends on VIRT_TO_BUS

	default N

	---help---

	  Enable support for National Instruments Lab-PC and compatibles

drivers/staging/iio/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 


menuconfig IIO

	tristate "Industrial I/O support"

	depends on !S390

	depends on GENERIC_HARDIRQS

	help

	  The industrial I/O subsystem provides a unified framework for

	  drivers for many different types of embedded sensors using a

drivers/staging/iio/accel/adis16204.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ struct adis16204_state { 


int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);



#ifdef CONFIG_IIO_RING_BUFFER

enum adis16204_scan {

	ADIS16204_SCAN_SUPPLY,

	ADIS16204_SCAN_ACC_X,
@@ -93,6 +92,7 @@ enum adis16204_scan { 
	ADIS16204_SCAN_TEMP,

};



#ifdef CONFIG_IIO_RING_BUFFER

void adis16204_remove_trigger(struct iio_dev *indio_dev);

int adis16204_probe_trigger(struct iio_dev *indio_dev);

drivers/staging/iio/accel/adis16209.h

+2 −2
Original line number Diff line number Diff line
@@ -121,8 +121,6 @@ struct adis16209_state { 


int adis16209_set_irq(struct iio_dev *indio_dev, bool enable);



#ifdef CONFIG_IIO_RING_BUFFER



#define ADIS16209_SCAN_SUPPLY	0

#define ADIS16209_SCAN_ACC_X	1

#define ADIS16209_SCAN_ACC_Y	2
@@ -132,6 +130,8 @@ int adis16209_set_irq(struct iio_dev *indio_dev, bool enable); 
#define ADIS16209_SCAN_INCLI_Y	6

#define ADIS16209_SCAN_ROT	7



#ifdef CONFIG_IIO_RING_BUFFER



void adis16209_remove_trigger(struct iio_dev *indio_dev);

int adis16209_probe_trigger(struct iio_dev *indio_dev);