summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip A. Prindeville <philipp@redfish-solutions.com>2011-07-25 17:13:05 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2011-08-08 10:36:00 -0700
commit09940cc53dc87b7c24f4a0639244901944b85e01 (patch)
tree2387d8430e887d85ff3f745dd8daff360c29ed68
parent27088fea257d6eb1a32ab58aae0a4ce5f712b300 (diff)
downloadlwn-09940cc53dc87b7c24f4a0639244901944b85e01.tar.gz
lwn-09940cc53dc87b7c24f4a0639244901944b85e01.zip
geode: reflect mfgpt dependency on mfd
commit 703f03c896fdbd726b809066ae279df513992f0e upstream. As stated in drivers/mfd/cs5535-mfd.c, the mfd driver exposes the BARs which then make the GPIO, MFGPT, ACPI, etc. all visible to the system. So the dependencies of the MFGPT stuff have changed, and most people expect Kconfig to bring in the necessary dependencies. Without them, the module fails to load and most people don't understand why because the details of the rewrite aren't captured anywhere most people who know to look. This dependency needs to be reflected in Kconfig. Signed-off-by: Philip A. Prindeville <philipp@redfish-solutions.com> Acked-by: Alexandros C. Couloumbis <alex@ozo.com> Acked-by: Andres Salomon <dilinger@queued.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/misc/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index e3551d20464f..ce97078c0b07 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -189,8 +189,7 @@ config SGI_XP
config CS5535_MFGPT
tristate "CS5535/CS5536 Geode Multi-Function General Purpose Timer (MFGPT) support"
- depends on PCI
- depends on X86
+ depends on PCI && X86 && MFD_CS5535
default n
help
This driver provides access to MFGPT functionality for other