diff options
| author | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
|---|---|---|
| committer | Grant Likely <grant.likely@secretlab.ca> | 2011-02-13 01:53:34 -0500 |
| commit | c170093d31bd4e3bc51881cc0f123beeca7872c9 (patch) | |
| tree | d93cd280d525dd339f33be010c75b7fd0bacd690 /drivers/ata/Kconfig | |
| parent | 557218e2d662574bc58d840fe116c7fd8d57aed8 (diff) | |
| parent | 78bba987bc025a7263248501b453476e77b93331 (diff) | |
Merge branch 'devicetree/merge' into spi/merge
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. |