diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:41:37 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-12-27 23:41:37 +0000 |
| commit | e814fb635cd269532a6a95a921c05841ababa7ae (patch) | |
| tree | b6764b819736ea0d3390fc11c564d321d63344d6 /arch/arm/mach-exynos/Makefile | |
| parent | 4551ae0a24bba06972247a80f721fc21f6b2b758 (diff) | |
| parent | fcf932350e979db9a29831a8a03bc300c4502bd5 (diff) | |
| download | talos-op-linux-e814fb635cd269532a6a95a921c05841ababa7ae.tar.gz talos-op-linux-e814fb635cd269532a6a95a921c05841ababa7ae.zip | |
Merge branch 'samsung/ohci' into next/drivers
* samsung/ohci:
ARM: EXYNOS: Add USB OHCI support to ORIGEN board
USB: Add Samsung Exynos OHCI diver
ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
ARM: EXYNOS: Add USB OHCI device
Diffstat (limited to 'arch/arm/mach-exynos/Makefile')
| -rw-r--r-- | arch/arm/mach-exynos/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-exynos/Makefile b/arch/arm/mach-exynos/Makefile index 59069a35e40b..f5f3b7994923 100644 --- a/arch/arm/mach-exynos/Makefile +++ b/arch/arm/mach-exynos/Makefile @@ -44,6 +44,7 @@ obj-$(CONFIG_EXYNOS4_DEV_AHCI) += dev-ahci.o obj-$(CONFIG_EXYNOS4_DEV_PD) += dev-pd.o obj-$(CONFIG_EXYNOS4_DEV_SYSMMU) += dev-sysmmu.o obj-$(CONFIG_EXYNOS4_DEV_DWMCI) += dev-dwmci.o +obj-$(CONFIG_EXYNOS4_DEV_USB_OHCI) += dev-ohci.o obj-$(CONFIG_EXYNOS4_SETUP_FIMC) += setup-fimc.o obj-$(CONFIG_EXYNOS4_SETUP_FIMD0) += setup-fimd0.o |
