Merge tag 'mfd-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-next

[linux.git] / drivers / mfd / syscon.c

diff --git a/drivers/mfd/syscon.c b/drivers/mfd/syscon.c
index 27db1f92bb262891d59effede70e149e131c4d37..71841f9181bd19f4ae6b832898353bc442999c2e 100644 (file)
--- a/drivers/mfd/syscon.c
+++ b/drivers/mfd/syscon.c
@@ -159,9 +159,6 @@ static int syscon_probe(struct platform_device *pdev)
 
 static const struct platform_device_id syscon_ids[] = {
        { "syscon", },
-#ifdef CONFIG_ARCH_CLPS711X
-       { "clps711x-syscon", },
-#endif
        { }
 };