Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353524
b: refs/heads/master
c: 762150e
h: refs/heads/master
v: v3
  • Loading branch information
Kees Cook committed Jan 11, 2013
1 parent a877755 commit aa05a80
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 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: 240335fd04b361817cdffde1ba1e2ae1d263cb43
refs/heads/master: 762150eb5dcd3fd6f1e09516add2e927df243b87
8 changes: 3 additions & 5 deletions trunk/drivers/ide/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -322,8 +322,7 @@ config BLK_DEV_GENERIC
which otherwise might not be supported.

config BLK_DEV_OPTI621
tristate "OPTi 82C621 chipset enhanced support (EXPERIMENTAL)"
depends on EXPERIMENTAL
tristate "OPTi 82C621 chipset enhanced support"
select BLK_DEV_IDEPCI
help
This is a driver for the OPTi 82C621 EIDE controller.
Expand Down Expand Up @@ -417,7 +416,6 @@ config BLK_DEV_CY82C693

config BLK_DEV_CS5520
tristate "Cyrix CS5510/20 MediaGX chipset support (VERY EXPERIMENTAL)"
depends on EXPERIMENTAL
select BLK_DEV_IDEDMA_PCI
help
Include support for PIO tuning and virtual DMA on the Cyrix MediaGX
Expand Down Expand Up @@ -761,8 +759,8 @@ config BLK_DEV_GAYLE
use Gayle IDE interfaces on the Zorro expansion bus.

config BLK_DEV_BUDDHA
tristate "Buddha/Catweasel/X-Surf IDE interface support (EXPERIMENTAL)"
depends on ZORRO && EXPERIMENTAL
tristate "Buddha/Catweasel/X-Surf IDE interface support"
depends on ZORRO
help
This is the IDE driver for the IDE interfaces on the Buddha, Catweasel
and X-Surf expansion boards. It supports up to two interfaces on the
Expand Down

0 comments on commit aa05a80

Please sign in to comment.