summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-12-22 12:53:32 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-12-22 12:53:32 -0800
commitabe8809c14f05430f9f8cb13bd70b2ec3195e84b (patch)
tree648244835839cdf7573795676a0c52adcab2a8c2
parentb9eda06f80b0db61a73bd87c6b0eb67d8aca55ad (diff)
parent19d40dcabf1cdf84e1a76c147b7177b5a6c21943 (diff)
downloadlinux-abe8809c14f05430f9f8cb13bd70b2ec3195e84b.tar.bz2
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/Kconfig2
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
config PATA_OF_PLATFORM
tristate "OpenFirmware platform device PATA support"
- depends on PATA_PLATFORM && OF
+ depends on PATA_PLATFORM && OF && OF_IRQ
help
This option enables support for generic directly connected ATA
devices commonly found on embedded systems with OpenFirmware