Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 353641
b: refs/heads/master
c: 48b3de2
h: refs/heads/master
i:
  353639: 39dcc23
v: v3
  • Loading branch information
Kees Cook authored and Greg Kroah-Hartman committed Jan 21, 2013
1 parent 4bda711 commit 5b0770c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 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: f756f28b84af5faa4dcb70ef10c6350b6ce081be
refs/heads/master: 48b3de219129b642963a6fc2c9e7612585672abd
24 changes: 12 additions & 12 deletions trunk/drivers/ata/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ config SATA_QSTOR

config SATA_SX4
tristate "Promise SATA SX4 support (Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
This option enables support for Promise Serial ATA SX4.

Expand Down Expand Up @@ -390,7 +390,7 @@ config PATA_CS5530

config PATA_CS5535
tristate "CS5535 PATA support (Experimental)"
depends on PCI && X86 && !X86_64 && EXPERIMENTAL
depends on PCI && X86 && !X86_64
help
This option enables support for the NatSemi/AMD CS5535
companion chip used with the Geode processor family.
Expand All @@ -408,7 +408,7 @@ config PATA_CS5536

config PATA_CYPRESS
tristate "Cypress CY82C693 PATA support (Very Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
This option enables support for the Cypress/Contaq CY82C693
chipset found in some Alpha systems
Expand Down Expand Up @@ -496,7 +496,7 @@ config PATA_IMX

config PATA_IT8213
tristate "IT8213 PATA support (Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
This option enables support for the ITE 821 PATA
controllers via the new ATA layer.
Expand Down Expand Up @@ -589,7 +589,7 @@ config PATA_OLDPIIX

config PATA_OPTIDMA
tristate "OPTI FireStar PATA support (Very Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
This option enables DMA/PIO support for the later OPTi
controllers found on some old motherboards and in some
Expand All @@ -616,7 +616,7 @@ config PATA_PDC_OLD

config PATA_RADISYS
tristate "RADISYS 82600 PATA support (Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
This option enables support for the RADISYS 82600
PATA controllers via the new ATA layer
Expand Down Expand Up @@ -687,7 +687,7 @@ config PATA_SIS

config PATA_TOSHIBA
tristate "Toshiba Piccolo support (Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
Support for the Toshiba Piccolo controllers. Currently only the
primary channel is supported by this driver.
Expand Down Expand Up @@ -738,7 +738,7 @@ comment "PIO-only SFF controllers"

config PATA_AT32
tristate "Atmel AVR32 PATA support (Experimental)"
depends on AVR32 && PLATFORM_AT32AP && EXPERIMENTAL
depends on AVR32 && PLATFORM_AT32AP
help
This option enables support for the IDE devices on the
Atmel AT32AP platform.
Expand All @@ -755,7 +755,7 @@ config PATA_AT91

config PATA_CMD640_PCI
tristate "CMD640 PCI PATA support (Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
This option enables support for the CMD640 PCI IDE
interface chip. Only the primary channel is currently
Expand Down Expand Up @@ -801,7 +801,7 @@ config PATA_NS87410

config PATA_OPTI
tristate "OPTI621/6215 PATA support (Very Experimental)"
depends on PCI && EXPERIMENTAL
depends on PCI
help
This option enables full PIO support for the early Opti ATA
controllers found on some old motherboards.
Expand Down Expand Up @@ -881,7 +881,7 @@ config PATA_SAMSUNG_CF

config PATA_WINBOND_VLB
tristate "Winbond W83759A VLB PATA support (Experimental)"
depends on ISA && EXPERIMENTAL
depends on ISA
select PATA_LEGACY
help
Support for the Winbond W83759A controller on Vesa Local Bus
Expand Down Expand Up @@ -909,7 +909,7 @@ config ATA_GENERIC

config PATA_LEGACY
tristate "Legacy ISA PATA support (Experimental)"
depends on (ISA || PCI) && EXPERIMENTAL
depends on (ISA || PCI)
help
This option enables support for ISA/VLB/PCI bus legacy PATA
ports and allows them to be accessed via the new ATA layer.
Expand Down

0 comments on commit 5b0770c

Please sign in to comment.