summaryrefslogtreecommitdiff
path: root/arch/arm/mach-s5pc100/common.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-17 16:47:11 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-05 09:50:42 +0100
commit0b1743f0b0e1f8db0be800c301c0cf83add46fe9 (patch)
treeebfe646ad89183f3de83c205fbe49d3e6ed3a260 /arch/arm/mach-s5pc100/common.c
parent88f002cc7c9c55f40bdaaa720a39b6484cdfbb3f (diff)
Revert: ARM: SAMSUNG: Add naming of s3c64xx-spi devices
This reverts commit baa526f45d3f096a1cd9f14b668203a03bbab6f9, which is commit 308b3afb97dc342e9c4f958d8b4c459ae0e22bd7 upstream. To quote Colin Cross: This patch breaks Exynos5 spi on 3.4.17. The patch with the bug that this patch was supposed to address went in to 3.6 and not 3.4, so this patch causes a driver name mismatch when applied to 3.4. Cc: Colin Cross <ccross@google.com> Cc: Heiko Stuebner <heiko@sntech.de> Cc: Sylwester Nawrocki <s.nawrocki@samsung.com> Cc: Kukjin Kim <kgene.kim@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/mach-s5pc100/common.c')
-rw-r--r--arch/arm/mach-s5pc100/common.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
index cc6e561c9958..621908658861 100644
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@ -45,7 +45,6 @@
#include <plat/fb-core.h>
#include <plat/iic-core.h>
#include <plat/onenand-core.h>
-#include <plat/spi-core.h>
#include <plat/regs-serial.h>
#include <plat/watchdog-reset.h>
@@ -166,8 +165,6 @@ void __init s5pc100_map_io(void)
s3c_onenand_setname("s5pc100-onenand");
s3c_fb_setname("s5pc100-fb");
s3c_cfcon_setname("s5pc100-pata");
-
- s3c64xx_spi_setname("s5pc100-spi");
}
void __init s5pc100_init_clocks(int xtal)