summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorAndres Salomon <dilinger@collabora.co.uk>2009-12-14 18:00:41 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-15 08:53:28 -0800
commitc95d1e53ed89b75a4d7b68d1cbae4607b1479243 (patch)
treeb82d2ef1e349a3da948fe4c7dbd56ebed0ad0e84 /drivers
parentf3a57a60d3e107d17aebb9e52b61c503e5bc14f9 (diff)
downloadlinux-3.10-c95d1e53ed89b75a4d7b68d1cbae4607b1479243.tar.gz
linux-3.10-c95d1e53ed89b75a4d7b68d1cbae4607b1479243.tar.bz2
linux-3.10-c95d1e53ed89b75a4d7b68d1cbae4607b1479243.zip
cs5535: drop the Geode-specific MFGPT/GPIO code
With generic modular drivers handling all of this stuff, the geode-specific code can go away. The cs5535-gpio, cs5535-mfgpt, and cs5535-clockevt drivers now handle this. Signed-off-by: Andres Salomon <dilinger@collabora.co.uk> Cc: Jordan Crouse <jordan@cosmicpenguin.net> Cc: Ingo Molnar <mingo@elte.hu> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: john stultz <johnstul@us.ibm.com> Cc: Chris Ball <cjb@laptop.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpio/Kconfig2
-rw-r--r--drivers/misc/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index df4b82d1348..57ca339924e 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -176,7 +176,7 @@ comment "PCI GPIO expanders:"
config GPIO_CS5535
tristate "AMD CS5535/CS5536 GPIO support"
- depends on PCI && !CS5535_GPIO && !MGEODE_LX
+ depends on PCI && !CS5535_GPIO
help
The AMD CS5535 and CS5536 southbridges support 28 GPIO pins that
can be used for quite a number of things. The CS5535/6 is found on
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index d6d6d846f0d..59f4ba1b703 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -189,7 +189,7 @@ config SGI_XP
config CS5535_MFGPT
tristate "CS5535/CS5536 Geode Multi-Function General Purpose Timer (MFGPT) support"
- depends on PCI && !MGEODE_LX
+ depends on PCI
depends on X86
default n
help