aboutsummaryrefslogtreecommitdiffstats
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-04 21:58:38 -0700
commitcb83d9f7840657a0f0cc29ba5c01ce7320e28e9a (patch)
tree127d2823ea87fa6ff009369f04da20de8ac3bc05
parent4d5553036a151d67c6da2e7581598ead685d452b (diff)
downloadkernel_samsung_aries-cb83d9f7840657a0f0cc29ba5c01ce7320e28e9a.zip
kernel_samsung_aries-cb83d9f7840657a0f0cc29ba5c01ce7320e28e9a.tar.gz
kernel_samsung_aries-cb83d9f7840657a0f0cc29ba5c01ce7320e28e9a.tar.bz2
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 4e349cd..3546474 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -245,8 +245,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