diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-22 15:53:32 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-22 15:53:32 -0500 |
| commit | abe8809c14f05430f9f8cb13bd70b2ec3195e84b (patch) | |
| tree | 648244835839cdf7573795676a0c52adcab2a8c2 | |
| parent | b9eda06f80b0db61a73bd87c6b0eb67d8aca55ad (diff) | |
| parent | 19d40dcabf1cdf84e1a76c147b7177b5a6c21943 (diff) | |
Merge branch 'upstream-linus' of git://github.com/jgarzik/libata-dev
* 'upstream-linus' of git://github.com/jgarzik/libata-dev:
pata_of_platform: Add missing CONFIG_OF_IRQ dependency.
| -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 6bdedd7cca2c..cf047c406d92 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig | |||
| @@ -820,7 +820,7 @@ config PATA_PLATFORM | |||
| 820 | 820 | ||
| 821 | config PATA_OF_PLATFORM | 821 | config PATA_OF_PLATFORM |
| 822 | tristate "OpenFirmware platform device PATA support" | 822 | tristate "OpenFirmware platform device PATA support" |
| 823 | depends on PATA_PLATFORM && OF | 823 | depends on PATA_PLATFORM && OF && OF_IRQ |
| 824 | help | 824 | help |
| 825 | This option enables support for generic directly connected ATA | 825 | This option enables support for generic directly connected ATA |
| 826 | devices commonly found on embedded systems with OpenFirmware | 826 | devices commonly found on embedded systems with OpenFirmware |