x86 enable COMEDI_PCMCIA_DRIVERS
centralize the comedi staging setting. svn path=/dists/trunk/linux-2.6/; revision=13964
This commit is contained in:
parent
71e12d3b52
commit
b1e93ff564
|
@ -19,7 +19,7 @@ linux-2.6 (2.6.31~rc3-1~experimental.1) UNRELEASED; urgency=low
|
||||||
* Disable v4l1 ov511 and quickcam_messenger drivers.
|
* Disable v4l1 ov511 and quickcam_messenger drivers.
|
||||||
* [x86_64] Enable HW_RANDOM_VIA.
|
* [x86_64] Enable HW_RANDOM_VIA.
|
||||||
* [x86] Keep divers staging stuff enabled.
|
* [x86] Keep divers staging stuff enabled.
|
||||||
* [x86] Enable RT3070.
|
* [x86] Enable RT3070, COMEDI_PCMCIA_DRIVERS.
|
||||||
|
|
||||||
[ Ben Hutchings ]
|
[ Ben Hutchings ]
|
||||||
* mga: remove unnecessary change from firmware-loading patch
|
* mga: remove unnecessary change from firmware-loading patch
|
||||||
|
|
|
@ -943,14 +943,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
|
||||||
CONFIG_SERIAL_8250_RSA=y
|
CONFIG_SERIAL_8250_RSA=y
|
||||||
CONFIG_SERIAL_JSM=m
|
CONFIG_SERIAL_JSM=m
|
||||||
|
|
||||||
##
|
|
||||||
## file: drivers/staging/comedi/Kconfig
|
|
||||||
##
|
|
||||||
CONFIG_COMEDI=m
|
|
||||||
# CONFIG_COMEDI_DEBUG is not set
|
|
||||||
CONFIG_COMEDI_PCI_DRIVERS=m
|
|
||||||
CONFIG_COMEDI_USB_DRIVERS=m
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/telephony/Kconfig
|
## file: drivers/telephony/Kconfig
|
||||||
##
|
##
|
||||||
|
|
|
@ -1113,14 +1113,6 @@ CONFIG_SERIAL_8250_SHARE_IRQ=y
|
||||||
CONFIG_SERIAL_8250_RSA=y
|
CONFIG_SERIAL_8250_RSA=y
|
||||||
CONFIG_SERIAL_JSM=m
|
CONFIG_SERIAL_JSM=m
|
||||||
|
|
||||||
##
|
|
||||||
## file: drivers/staging/comedi/Kconfig
|
|
||||||
##
|
|
||||||
CONFIG_COMEDI=m
|
|
||||||
# CONFIG_COMEDI_DEBUG is not set
|
|
||||||
CONFIG_COMEDI_PCI_DRIVERS=m
|
|
||||||
CONFIG_COMEDI_USB_DRIVERS=m
|
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/telephony/Kconfig
|
## file: drivers/telephony/Kconfig
|
||||||
##
|
##
|
||||||
|
|
|
@ -213,7 +213,11 @@ CONFIG_STAGING=y
|
||||||
##
|
##
|
||||||
## file: drivers/staging/comedi/Kconfig
|
## file: drivers/staging/comedi/Kconfig
|
||||||
##
|
##
|
||||||
# CONFIG_COMEDI is not set
|
CONFIG_COMEDI=m
|
||||||
|
# CONFIG_COMEDI_DEBUG is not set
|
||||||
|
CONFIG_COMEDI_PCI_DRIVERS=m
|
||||||
|
CONFIG_COMEDI_PCMCIA_DRIVERS=m
|
||||||
|
CONFIG_COMEDI_USB_DRIVERS=m
|
||||||
|
|
||||||
##
|
##
|
||||||
## file: drivers/staging/dst/Kconfig
|
## file: drivers/staging/dst/Kconfig
|
||||||
|
|
Loading…
Reference in New Issue