diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-21 04:39:51 -0500 |
| commit | 198030782cedf25391e67e7c88b04f87a5eb6563 (patch) | |
| tree | 5b7368c6bf052bcb4bb273497a57900720d36f51 /drivers/ata/Kconfig | |
| parent | 4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e (diff) | |
| parent | 92181f190b649f7ef2b79cbf5c00f26ccc66da2a (diff) | |
Merge branch 'x86/mm' into core/percpu
Conflicts:
arch/x86/mm/fault.c
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 1a7be96d627b..503a908afc80 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -698,6 +698,15 @@ config PATA_IXP4XX_CF | |||
| 698 | 698 | ||
| 699 | If unsure, say N. | 699 | If unsure, say N. |
| 700 | 700 | ||
| 701 | config PATA_OCTEON_CF | ||
| 702 | tristate "OCTEON Boot Bus Compact Flash support" | ||
| 703 | depends on CPU_CAVIUM_OCTEON | ||
| 704 | help | ||
| 705 | This option enables a polled compact flash driver for use with | ||
| 706 | compact flash cards attached to the OCTEON boot bus. | ||
| 707 | |||
| 708 | If unsure, say N. | ||
| 709 | |||
| 701 | config PATA_SCC | 710 | config PATA_SCC |
| 702 | tristate "Toshiba's Cell Reference Set IDE support" | 711 | tristate "Toshiba's Cell Reference Set IDE support" |
| 703 | depends on PCI && PPC_CELLEB | 712 | depends on PCI && PPC_CELLEB |