diff options
author | Steven Rostedt <srostedt@redhat.com> | 2012-11-06 07:58:03 -0500 |
---|---|---|
committer | Steven Rostedt <rostedt@goodmis.org> | 2012-11-06 07:58:03 -0500 |
commit | fd88e5cca97cd30fe145d55538eecbf3658ea311 (patch) | |
tree | a458ec25ece79bfdba0a84ad00c3ad7352d785e0 /arch/arm/mach-s5p64x0/common.c | |
parent | 845165446092e0212c3c0aec0f2eeb269b75d834 (diff) | |
parent | 8ddd4813010397b5aa3bf9f81de1994c415dfc10 (diff) |
Merge tag 'v3.4.18' into v3.4-rt
This is the 3.4.18 stable release
Diffstat (limited to 'arch/arm/mach-s5p64x0/common.c')
-rw-r--r-- | arch/arm/mach-s5p64x0/common.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c index 111e404a81fd..6e6a0a9d6778 100644 --- a/arch/arm/mach-s5p64x0/common.c +++ b/arch/arm/mach-s5p64x0/common.c @@ -44,7 +44,6 @@ #include <plat/sdhci.h> #include <plat/adc-core.h> #include <plat/fb-core.h> -#include <plat/spi-core.h> #include <plat/gpio-cfg.h> #include <plat/regs-irqtype.h> #include <plat/regs-serial.h> @@ -180,7 +179,6 @@ void __init s5p6440_map_io(void) /* initialize any device information early */ s3c_adc_setname("s3c64xx-adc"); s3c_fb_setname("s5p64x0-fb"); - s3c64xx_spi_setname("s5p64x0-spi"); s5p64x0_default_sdhci0(); s5p64x0_default_sdhci1(); @@ -195,7 +193,6 @@ void __init s5p6450_map_io(void) /* initialize any device information early */ s3c_adc_setname("s3c64xx-adc"); s3c_fb_setname("s5p64x0-fb"); - s3c64xx_spi_setname("s5p64x0-spi"); s5p64x0_default_sdhci0(); s5p64x0_default_sdhci1(); |