git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'integration' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
Makefile
diff --git
a/arch/arm/mach-exynos4/Makefile
b/arch/arm/mach-exynos4/Makefile
index
a9bb94f
..
60fe5ec
100644
(file)
--- a/
arch/arm/mach-exynos4/Makefile
+++ b/
arch/arm/mach-exynos4/Makefile
@@
-56,4
+56,4
@@
obj-$(CONFIG_EXYNOS4_SETUP_KEYPAD) += setup-keypad.o
obj-$(CONFIG_EXYNOS4_SETUP_SDHCI) += setup-sdhci.o
obj-$(CONFIG_EXYNOS4_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o
-obj-$(CONFIG_
USB_SUPPORT) +=
usb-phy.o
+obj-$(CONFIG_
EXYNOS4_SETUP_USB_PHY) += setup-
usb-phy.o