diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-30 19:25:51 -0500 |
| commit | bd45ac0c5daae35e7c71138172e63df5cf644cf6 (patch) | |
| tree | 5eb5a599bf6a9d7a8a34e802db932aa9e9555de4 /drivers/ata/Kconfig | |
| parent | 4eece4ccf997c0e6d8fdad3d842e37b16b8d705f (diff) | |
| parent | 5bdeae46be6dfe9efa44a548bd622af325f4bdb4 (diff) | |
Merge branch 'linux-2.6'
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index 75939dd06295..ae19c9b30d15 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -459,6 +459,15 @@ config PATA_NETCELL | |||
| 459 | 459 | ||
| 460 | If unsure, say N. | 460 | If unsure, say N. |
| 461 | 461 | ||
| 462 | config PATA_NINJA32 | ||
| 463 | tristate "Ninja32/Delkin Cardbus ATA support (Experimental)" | ||
| 464 | depends on PCI && EXPERIMENTAL | ||
| 465 | help | ||
| 466 | This option enables support for the Ninja32, Delkin and | ||
| 467 | possibly other brands of Cardbus ATA adapter | ||
| 468 | |||
| 469 | If unsure, say N. | ||
| 470 | |||
| 462 | config PATA_NS87410 | 471 | config PATA_NS87410 |
| 463 | tristate "Nat Semi NS87410 PATA support (Experimental)" | 472 | tristate "Nat Semi NS87410 PATA support (Experimental)" |
| 464 | depends on PCI && EXPERIMENTAL | 473 | depends on PCI && EXPERIMENTAL |