diff options
| author | Iliyan Malchev <malchev@google.com> | 2011-08-04 16:45:04 -0700 |
|---|---|---|
| committer | Iliyan Malchev <malchev@google.com> | 2011-08-04 16:45:04 -0700 |
| commit | 8a8d0b78174dc18ec9f4d1743117d933e61e3790 (patch) | |
| tree | 6078823cb7bbe7327b4e212d986ae578f25b1f00 /arch/arm/mach-omap2/Makefile | |
| parent | 9d0452856e4f0bf57d3020a632ad5bad819b8071 (diff) | |
| parent | c51693927bd88684cc50c1b278bf724aa96139a8 (diff) | |
| download | kernel_samsung_tuna-8a8d0b78174dc18ec9f4d1743117d933e61e3790.zip kernel_samsung_tuna-8a8d0b78174dc18ec9f4d1743117d933e61e3790.tar.gz kernel_samsung_tuna-8a8d0b78174dc18ec9f4d1743117d933e61e3790.tar.bz2 | |
Merge branch 'android-omap-3.0' into android-omap-tuna-3.0
Conflicts:
drivers/misc/Kconfig
drivers/misc/Makefile
sound/soc/omap/abe/abe_port.c
Signed-off-by: Iliyan Malchev <malchev@google.com>
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 95fd52f..c3072d4 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -21,6 +21,7 @@ obj-$(CONFIG_OMAP_MCBSP) += mcbsp.o obj-$(CONFIG_TWL4030_CORE) += omap_twl.o obj-$(CONFIG_OMAP_TPS6236X) += omap_tps6236x.o +obj-$(CONFIG_OMAP_TEMP_SENSOR) +=temp_sensor_device.o # SMP support ONLY available for OMAP4 obj-$(CONFIG_SMP) += omap-smp.o omap-headsmp.o |