diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-03-11 15:15:41 -0400 |
| commit | 5b4d4771e2a56671c7f1c94edda427a1e3d6f111 (patch) | |
| tree | 58718288a28cca121a94b681a7865473a10dfd64 /drivers/ata/Kconfig | |
| parent | 55f78e1771f0886162edd441dd4f39c287779de2 (diff) | |
| parent | baadac8b10c5ac15ce3d26b68fa266c8889b163f (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/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 ba8f7f4dfa11..e469647330de 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -538,6 +538,15 @@ config PATA_RADISYS | |||
| 538 | 538 | ||
| 539 | If unsure, say N. | 539 | If unsure, say N. |
| 540 | 540 | ||
| 541 | config PATA_RB500 | ||
| 542 | tristate "RouterBoard 500 PATA CompactFlash support" | ||
| 543 | depends on MIKROTIK_RB500 | ||
| 544 | help | ||
| 545 | This option enables support for the RouterBoard 500 | ||
| 546 | PATA CompactFlash controller. | ||
| 547 | |||
| 548 | If unsure, say N. | ||
| 549 | |||
| 541 | config PATA_RZ1000 | 550 | config PATA_RZ1000 |
| 542 | tristate "PC Tech RZ1000 PATA support" | 551 | tristate "PC Tech RZ1000 PATA support" |
| 543 | depends on PCI | 552 | depends on PCI |