diff options
author | Tushar Behera <tushar.behera@linaro.org> | 2011-06-03 03:04:14 -0400 |
---|---|---|
committer | Kukjin Kim <kgene.kim@samsung.com> | 2011-06-03 18:30:02 -0400 |
commit | f8d8e12dd1e0e2559e2419b7acdaf9eee9865736 (patch) | |
tree | a9a468cc1ba324c5979df0e98b7f8d3dda43afe5 | |
parent | 08115a139229ca84adfef4d5983c3c186b9d1c30 (diff) |
ARM: S5P: Fix compilation error for exynos4_defconfig
Added Kconfig entry for setup-usb-phy.c on which EHCI support
is dependent on.
Following the naming convention of other setup files, we have
following renaming.
usb-phy.c ==> setup-usb-phy.c
Signed-off-by: Tushar Behera <tushar.behera@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
-rw-r--r-- | arch/arm/mach-exynos4/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-exynos4/setup-usb-phy.c (renamed from arch/arm/mach-exynos4/usb-phy.c) | 0 |
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-exynos4/Kconfig b/arch/arm/mach-exynos4/Kconfig index b92c1e557145..1435fc31c4b2 100644 --- a/arch/arm/mach-exynos4/Kconfig +++ b/arch/arm/mach-exynos4/Kconfig | |||
@@ -91,6 +91,11 @@ config EXYNOS4_SETUP_FIMC | |||
91 | help | 91 | help |
92 | Common setup code for the camera interfaces. | 92 | Common setup code for the camera interfaces. |
93 | 93 | ||
94 | config EXYNOS4_SETUP_USB_PHY | ||
95 | bool | ||
96 | help | ||
97 | Common setup code for USB PHY controller | ||
98 | |||
94 | # machine support | 99 | # machine support |
95 | 100 | ||
96 | menu "EXYNOS4 Machines" | 101 | menu "EXYNOS4 Machines" |
@@ -176,6 +181,7 @@ config MACH_NURI | |||
176 | select EXYNOS4_SETUP_I2C3 | 181 | select EXYNOS4_SETUP_I2C3 |
177 | select EXYNOS4_SETUP_I2C5 | 182 | select EXYNOS4_SETUP_I2C5 |
178 | select EXYNOS4_SETUP_SDHCI | 183 | select EXYNOS4_SETUP_SDHCI |
184 | select EXYNOS4_SETUP_USB_PHY | ||
179 | select SAMSUNG_DEV_PWM | 185 | select SAMSUNG_DEV_PWM |
180 | help | 186 | help |
181 | Machine support for Samsung Mobile NURI Board. | 187 | Machine support for Samsung Mobile NURI Board. |
diff --git a/arch/arm/mach-exynos4/Makefile b/arch/arm/mach-exynos4/Makefile index a9bb94fabaa7..60fe5ecf3599 100644 --- a/arch/arm/mach-exynos4/Makefile +++ b/arch/arm/mach-exynos4/Makefile | |||
@@ -56,4 +56,4 @@ obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o | |||
56 | obj-$(CONFIG_EXYNOS4_SETUP_SDHCI) += setup-sdhci.o | 56 | obj-$(CONFIG_EXYNOS4_SETUP_SDHCI) += setup-sdhci.o |
57 | obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o | 57 | obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o |
58 | 58 | ||
59 | obj-$(CONFIG_USB_SUPPORT) += usb-phy.o | 59 | obj-$(CONFIG_EXYNOS4_SETUP_USB_PHY) += setup-usb-phy.o |
diff --git a/arch/arm/mach-exynos4/usb-phy.c b/arch/arm/mach-exynos4/setup-usb-phy.c index 0883c1b824b9..0883c1b824b9 100644 --- a/arch/arm/mach-exynos4/usb-phy.c +++ b/arch/arm/mach-exynos4/setup-usb-phy.c | |||