diff options
| author | Colin Cross <ccross@android.com> | 2011-07-13 17:23:39 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-07-13 17:23:39 -0700 |
| commit | 32d6e08c0f755313e2461d848a941dfb79948556 (patch) | |
| tree | 3bc8a19ff9e23713e45e6ac6e7072059d4da74b0 /arch/arm/mach-omap2/Makefile | |
| parent | 5fc5470c62dfd3fd5b1252049a9eca8ca12cab42 (diff) | |
| parent | 43cc7e1ec0b77d1e80bcee7889a308ae85da9366 (diff) | |
| download | kernel_samsung_tuna-32d6e08c0f755313e2461d848a941dfb79948556.zip kernel_samsung_tuna-32d6e08c0f755313e2461d848a941dfb79948556.tar.gz kernel_samsung_tuna-32d6e08c0f755313e2461d848a941dfb79948556.tar.bz2 | |
Merge branch 'linux-omap-3.0' into android-omap-3.0
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 7ef7745..9ceea9b 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -286,3 +286,4 @@ obj-y += $(disp-m) $(disp-y) obj-y += common-board-devices.o obj-$(CONFIG_OMAP_REMOTE_PROC) += remoteproc.o +obj-$(CONFIG_OMAP_HSI_DEVICE) += omap_hsi.o |