diff options
| author | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:29 +0800 |
|---|---|---|
| committer | Philippe Langlais <philippe.langlais@stericsson.com> | 2012-06-04 19:45:29 +0800 |
| commit | cff72c10aa27e3a74eb5d5b7ceb7808d8c917d15 (patch) | |
| tree | dd91659a4e64af53c21e1c96808a322bbfc0bbb0 /drivers/misc/Makefile | |
| parent | c633be5ecf5fd7131c1af12a1d0de06655bc74cb (diff) | |
| parent | 26404d61c00e95e2f8ac7d2aae4d35fe0ff4b520 (diff) | |
Merge topic branch 'hwmem' into integration-linux-ux500
Signed-off-by: Philippe Langlais <philippe.langlais@stericsson.com>
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 90f219db507..5317121efcd 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -47,6 +47,7 @@ obj-$(CONFIG_AB8500_PWM) += ab8500-pwm.o obj-y += lis3lv02d/ obj-y += carma/ obj-$(CONFIG_STM_TRACE) += stm.o +obj-$(CONFIG_HWMEM) += hwmem/ obj-$(CONFIG_USB_SWITCH_FSA9480) += fsa9480.o obj-$(CONFIG_ALTERA_STAPL) +=altera-stapl/ obj-$(CONFIG_MAX8997_MUIC) += max8997-muic.o |