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 'davinci-next' of git://gitorious.org/linux-davinci/linux-davinci into...
[pandora-kernel.git]
/
arch
/
arm
/
mach-exynos4
/
Makefile
diff --git
a/arch/arm/mach-exynos4/Makefile
b/arch/arm/mach-exynos4/Makefile
index
9be104f
..
7778975
100644
(file)
--- a/
arch/arm/mach-exynos4/Makefile
+++ b/
arch/arm/mach-exynos4/Makefile
@@
-54,3
+54,5
@@
obj-$(CONFIG_EXYNOS4_SETUP_I2C7) += setup-i2c7.o
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