diff options
| author | Robert Marklund <robert.marklund@stericsson.com> | 2011-06-23 13:33:10 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:15:41 +0200 |
| commit | 9650f0bb4537ef83d6ca8e788ed4ac606246ba11 (patch) | |
| tree | 2b2d0e51dbfdc68ca786f32cd7a27afc2280806e /drivers/misc | |
| parent | f133c7814841e5856d32388c3d7f212ea9a88482 (diff) | |
Fix merge problems merge with org commit.
Signed-off-by: Robert Marklund <robert.marklund@stericsson.com>
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 0b5d16280fc..7eb35b5a787 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -46,7 +46,7 @@ obj-y += ti-st/ obj-$(CONFIG_AB8500_PWM) += ab8500-pwm.o obj-y += lis3lv02d/ obj-y += carma/ -obj-$(CONFIG_STM_TRACE) += stm.o/ +obj-$(CONFIG_STM_TRACE) += stm.o obj-$(CONFIG_STE_TRACE_MODEM) += db8500-modem-trace.o obj-$(CONFIG_DBX500_MLOADER) += dbx500-mloader.o obj-$(CONFIG_U8500_SHRM) += shrm/ |