Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 324344
b: refs/heads/master
c: 6592921
h: refs/heads/master
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Sep 18, 2012
1 parent 5b4c3e2 commit 4a2eafc
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 16 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a4136b49fbb9a6a885618ca38e66b4967091a9ec
refs/heads/master: 65929215d85702dd4a76db0ba9fbfc022ab99e55
6 changes: 3 additions & 3 deletions trunk/drivers/char/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -418,8 +418,8 @@ config APPLICOM
If unsure, say N.

config SONYPI
tristate "Sony Vaio Programmable I/O Control Device support (EXPERIMENTAL)"
depends on EXPERIMENTAL && X86 && PCI && INPUT && !64BIT
tristate "Sony Vaio Programmable I/O Control Device support"
depends on X86 && PCI && INPUT && !64BIT
---help---
This driver enables access to the Sony Programmable I/O Control
Device which can be found in many (all ?) Sony Vaio laptops.
Expand Down Expand Up @@ -566,7 +566,7 @@ source "drivers/char/tpm/Kconfig"

config TELCLOCK
tristate "Telecom clock driver for ATCA SBC"
depends on EXPERIMENTAL && X86
depends on X86
default n
help
The telecom clock device is specific to the MPCBL0010 and MPCBL0050
Expand Down
14 changes: 7 additions & 7 deletions trunk/drivers/misc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ config ATMEL_TCB_CLKSRC_BLOCK

config IBM_ASM
tristate "Device driver for IBM RSA service processor"
depends on X86 && PCI && INPUT && EXPERIMENTAL
depends on X86 && PCI && INPUT
---help---
This option enables device driver support for in-band access to the
IBM RSA (Condor) service processor in eServer xSeries systems.
Expand Down Expand Up @@ -162,8 +162,8 @@ config SGI_IOC4
Otherwise say N.

config TIFM_CORE
tristate "TI Flash Media interface support (EXPERIMENTAL)"
depends on EXPERIMENTAL && PCI
tristate "TI Flash Media interface support"
depends on PCI
help
If you want support for Texas Instruments(R) Flash Media adapters
you should select this option and then also choose an appropriate
Expand All @@ -178,8 +178,8 @@ config TIFM_CORE
be called tifm_core.

config TIFM_7XX1
tristate "TI Flash Media PCI74xx/PCI76xx host adapter support (EXPERIMENTAL)"
depends on PCI && TIFM_CORE && EXPERIMENTAL
tristate "TI Flash Media PCI74xx/PCI76xx host adapter support"
depends on PCI && TIFM_CORE
default TIFM_CORE
help
This option enables support for Texas Instruments(R) PCI74xx and
Expand All @@ -192,7 +192,7 @@ config TIFM_7XX1

config ICS932S401
tristate "Integrated Circuits ICS932S401"
depends on I2C && EXPERIMENTAL
depends on I2C
help
If you say yes here you get support for the Integrated Circuits
ICS932S401 clock control chips.
Expand Down Expand Up @@ -398,7 +398,7 @@ config EP93XX_PWM

config DS1682
tristate "Dallas DS1682 Total Elapsed Time Recorder with Alarm"
depends on I2C && EXPERIMENTAL
depends on I2C
help
If you say yes here you get support for Dallas Semiconductor
DS1682 Total Elapsed Time Recorder.
Expand Down
5 changes: 2 additions & 3 deletions trunk/drivers/misc/c2port/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
#

menuconfig C2PORT
tristate "Silicon Labs C2 port support (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "Silicon Labs C2 port support"
default n
help
This option enables support for Silicon Labs C2 port used to
Expand All @@ -22,7 +21,7 @@ menuconfig C2PORT
if C2PORT

config C2PORT_DURAMAR_2150
tristate "C2 port support for Eurotech's Duramar 2150 (EXPERIMENTAL)"
tristate "C2 port support for Eurotech's Duramar 2150"
depends on X86
default n
help
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/misc/eeprom/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ config EEPROM_LEGACY

config EEPROM_MAX6875
tristate "Maxim MAX6874/5 power supply supervisor"
depends on I2C && EXPERIMENTAL
depends on I2C
help
If you say yes here you get read-only support for the user EEPROM of
the Maxim MAX6874/5 EEPROM-programmable, quad power-supply
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/misc/mei/Kconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
config INTEL_MEI
tristate "Intel Management Engine Interface (Intel MEI)"
depends on X86 && PCI && EXPERIMENTAL && WATCHDOG_CORE
depends on X86 && PCI && WATCHDOG_CORE
help
The Intel Management Engine (Intel ME) provides Manageability,
Security and Media services for system containing Intel chipsets.
Expand Down

0 comments on commit 4a2eafc

Please sign in to comment.