Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353647
b: refs/heads/master
c: 417e86c
h: refs/heads/master
i:
  353645: 7fe8afc
  353643: 0cd69df
  353639: 39dcc23
  353631: b4666c9
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent e26be55 commit 1b36932
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 11 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: e11847b18402ded98e06fb7e9520603a3626bfb7
refs/heads/master: 417e86ce5ea8b87f864909f54f38a0b78aeb15b7
2 changes: 1 addition & 1 deletion trunk/drivers/i2c/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ source drivers/i2c/busses/Kconfig

config I2C_STUB
tristate "I2C/SMBus Test Stub"
depends on EXPERIMENTAL && m
depends on m
default 'n'
help
This module may be useful to developers of SMBus client drivers,
Expand Down
16 changes: 7 additions & 9 deletions trunk/drivers/i2c/busses/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ config I2C_ALI1535

config I2C_ALI1563
tristate "ALI 1563"
depends on PCI && EXPERIMENTAL
depends on PCI
help
If you say yes to this option, support will be included for the SMB
Host controller on Acer Labs Inc. (ALI) M1563 South Bridges. The SMB
Expand Down Expand Up @@ -56,7 +56,7 @@ config I2C_AMD756

config I2C_AMD756_S4882
tristate "SMBus multiplexing on the Tyan S4882"
depends on I2C_AMD756 && X86 && EXPERIMENTAL
depends on I2C_AMD756 && X86
help
Enabling this option will add specific SMBus support for the Tyan
S4882 motherboard. On this 4-CPU board, the SMBus is multiplexed
Expand Down Expand Up @@ -164,7 +164,7 @@ config I2C_NFORCE2

config I2C_NFORCE2_S4985
tristate "SMBus multiplexing on the Tyan S4985"
depends on I2C_NFORCE2 && X86 && EXPERIMENTAL
depends on I2C_NFORCE2 && X86
help
Enabling this option will add specific SMBus support for the Tyan
S4985 motherboard. On this 4-CPU board, the SMBus is multiplexed
Expand Down Expand Up @@ -215,7 +215,7 @@ config I2C_SIS96X

config I2C_VIA
tristate "VIA VT82C586B"
depends on PCI && EXPERIMENTAL
depends on PCI
select I2C_ALGOBIT
help
If you say yes to this option, support will be included for the VIA
Expand Down Expand Up @@ -267,7 +267,7 @@ comment "Mac SMBus host controller drivers"

config I2C_HYDRA
tristate "CHRP Apple Hydra Mac I/O I2C interface"
depends on PCI && PPC_CHRP && EXPERIMENTAL
depends on PCI && PPC_CHRP
select I2C_ALGOBIT
help
This supports the use of the I2C interface in the Apple Hydra Mac
Expand All @@ -293,7 +293,7 @@ comment "I2C system bus drivers (mostly embedded / system-on-chip)"

config I2C_AT91
tristate "Atmel AT91 I2C Two-Wire interface (TWI)"
depends on ARCH_AT91 && EXPERIMENTAL
depends on ARCH_AT91
help
This supports the use of the I2C interface on Atmel AT91
processors.
Expand Down Expand Up @@ -519,7 +519,6 @@ config I2C_NUC900

config I2C_OCORES
tristate "OpenCores I2C Controller"
depends on EXPERIMENTAL
help
If you say yes to this option, support will be included for the
OpenCores I2C controller. For details see
Expand Down Expand Up @@ -712,7 +711,7 @@ config I2C_OCTEON

config I2C_XILINX
tristate "Xilinx I2C Controller"
depends on EXPERIMENTAL && HAS_IOMEM
depends on HAS_IOMEM
help
If you say yes to this option, support will be included for the
Xilinx I2C controller.
Expand Down Expand Up @@ -803,7 +802,6 @@ config I2C_PARPORT_LIGHT

config I2C_TAOS_EVM
tristate "TAOS evaluation module"
depends on EXPERIMENTAL
select SERIO
select SERIO_SERPORT
default n
Expand Down

0 comments on commit 1b36932

Please sign in to comment.