diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:03 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-02 01:10:06 -0500 |
| commit | 8104a4775ad8a7863af0b898224b15aa708582db (patch) | |
| tree | 71380e4db36e9d91e521d0a98be74981e32a6700 /drivers/ata/Kconfig | |
| parent | f6bbc1daac964da551130dbf01809d3fbd178b2d (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into perf/core
Merge reason: Pick up latest fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/ata/Kconfig')
| -rw-r--r-- | drivers/ata/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index c6b298d4c136..c2328aed0836 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -783,7 +783,7 @@ config PATA_PCMCIA | |||
| 783 | 783 | ||
| 784 | config PATA_PLATFORM | 784 | config PATA_PLATFORM |
| 785 | tristate "Generic platform device PATA support" | 785 | tristate "Generic platform device PATA support" |
| 786 | depends on EMBEDDED || PPC || HAVE_PATA_PLATFORM | 786 | depends on EXPERT || PPC || HAVE_PATA_PLATFORM |
| 787 | help | 787 | help |
| 788 | This option enables support for generic directly connected ATA | 788 | This option enables support for generic directly connected ATA |
| 789 | devices commonly found on embedded systems. | 789 | devices commonly found on embedded systems. |