diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2013-06-07 13:18:59 +0200 |
commit | 7a4b35082c0f6997cb32b67a9cde169ec8e64706 (patch) | |
tree | c3fb875143d9c7862c2051bcd3447e26e354fdde /drivers/parport/Kconfig | |
parent | defa4c738aa90e29e91eff43b0c1b3198367ce9c (diff) | |
parent | ea61623fe9badd5a195b3a0878e6d89a2f97ac0e (diff) | |
download | linux-next-7a4b35082c0f6997cb32b67a9cde169ec8e64706.tar.gz |
Merge branch 'cpufreq-next' of git://git.linaro.org/people/vireshk/linux into pm-cpufreq
ARM cpufreq updates from Viresh Kumar.
Diffstat (limited to 'drivers/parport/Kconfig')
-rw-r--r-- | drivers/parport/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/parport/Kconfig b/drivers/parport/Kconfig index 24e12d4d1769..a50576081b34 100644 --- a/drivers/parport/Kconfig +++ b/drivers/parport/Kconfig @@ -71,7 +71,7 @@ config PARPORT_PC_FIFO config PARPORT_PC_SUPERIO bool "SuperIO chipset support" - depends on PARPORT_PC + depends on PARPORT_PC && !PARISC help Saying Y here enables some probes for Super-IO chipsets in order to find out things like base addresses, IRQ lines and DMA channels. It |