From ec054e1a54a0928b43dc1ab154b7b9ff31410bbc Mon Sep 17 00:00:00 2001 From: Kyoungil Kim Date: Sun, 13 May 2012 09:00:47 +0900 Subject: [PATCH] --- yaml --- r: 308401 b: refs/heads/master c: a024fa1313d57264ad88a7a4f2f96f9472986712 h: refs/heads/master i: 308399: 81bc81ec0b902178d7e7790c493fa37e0eab8a0e v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-exynos/Kconfig | 2 +- trunk/arch/arm/mach-exynos/Makefile | 2 +- trunk/arch/arm/mach-exynos/include/mach/spi-clocks.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index e4cffd8e0dd3..47f0749d2f02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20ef9e08d27b3f5e09c32d4d371fa97f610a3069 +refs/heads/master: a024fa1313d57264ad88a7a4f2f96f9472986712 diff --git a/trunk/arch/arm/mach-exynos/Kconfig b/trunk/arch/arm/mach-exynos/Kconfig index 4bb2f9464e23..ff3e47d7c89f 100644 --- a/trunk/arch/arm/mach-exynos/Kconfig +++ b/trunk/arch/arm/mach-exynos/Kconfig @@ -167,7 +167,7 @@ config EXYNOS4_SETUP_USB_PHY help Common setup code for USB PHY controller -config EXYNOS4_SETUP_SPI +config EXYNOS_SETUP_SPI bool help Common setup code for SPI GPIO configurations. diff --git a/trunk/arch/arm/mach-exynos/Makefile b/trunk/arch/arm/mach-exynos/Makefile index 84c06ae53ee8..440a637c76f1 100644 --- a/trunk/arch/arm/mach-exynos/Makefile +++ b/trunk/arch/arm/mach-exynos/Makefile @@ -69,4 +69,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o -obj-$(CONFIG_EXYNOS4_SETUP_SPI) += setup-spi.o +obj-$(CONFIG_EXYNOS_SETUP_SPI) += setup-spi.o diff --git a/trunk/arch/arm/mach-exynos/include/mach/spi-clocks.h b/trunk/arch/arm/mach-exynos/include/mach/spi-clocks.h index 576efdf6d091..c71a5fba6a84 100644 --- a/trunk/arch/arm/mach-exynos/include/mach/spi-clocks.h +++ b/trunk/arch/arm/mach-exynos/include/mach/spi-clocks.h @@ -11,6 +11,6 @@ #define __ASM_ARCH_SPI_CLKS_H __FILE__ /* Must source from SCLK_SPI */ -#define EXYNOS4_SPI_SRCCLK_SCLK 0 +#define EXYNOS_SPI_SRCCLK_SCLK 0 #endif /* __ASM_ARCH_SPI_CLKS_H */