diff options
| author | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 09:48:20 +0200 |
|---|---|---|
| committer | codeworkx <codeworkx@cyanogenmod.com> | 2012-09-22 14:02:16 +0200 |
| commit | 2489007e7d740ccbc3e0a202914e243ad5178787 (patch) | |
| tree | b8e6380ea7b1da63474ad68a5dba997e01146043 /drivers/misc/Makefile | |
| parent | 5f67568eb31e3a813c7c52461dcf66ade15fc2e7 (diff) | |
| download | kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.zip kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.gz kernel_samsung_smdk4412-2489007e7d740ccbc3e0a202914e243ad5178787.tar.bz2 | |
merge opensource jb u5
Change-Id: I1aaec157aa196f3448eff8636134fce89a814cf2
Diffstat (limited to 'drivers/misc/Makefile')
| -rw-r--r-- | drivers/misc/Makefile | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile index 027da64..2c5dd1b 100644 --- a/drivers/misc/Makefile +++ b/drivers/misc/Makefile @@ -1,4 +1,4 @@ -# + # Makefile for misc devices that really don't fit anywhere else. # @@ -55,18 +55,32 @@ obj-$(CONFIG_APANIC) += apanic.o obj-$(CONFIG_SENSORS_AK8975) += akm8975.o obj-$(CONFIG_SAMSUNG_C2C) += c2c/ obj-$(CONFIG_USBHUB_USB3503) += usb3503.o +obj-$(CONFIG_USBHUB_USB3503_OTG_CONN) += usb3503_otg_conn.o +obj-$(CONFIG_USBHUB_USB3803) += usb3803.o +ifeq ($(CONFIG_SEC_MODEM_P8LTE),y) +obj-$(CONFIG_SEC_MODEM) += modem_if_na/ +else obj-$(CONFIG_SEC_MODEM) += modem_if/ +endif obj-$(CONFIG_MFD_MAX77693) += max77693-muic.o obj-$(CONFIG_STMPE811_ADC) += stmpe811-adc.o obj-$(CONFIG_JACK_MON) += jack.o obj-$(CONFIG_UART_SELECT) += uart_select.o +obj-$(CONFIG_WIMAX_CMC) += max8893.o +ifeq ($(CONFIG_MUIC_DET_JACK),y) +obj-$(CONFIG_SEC_DEV_JACK) += sec_jack_muic.o +else obj-$(CONFIG_SEC_DEV_JACK) += sec_jack.o +endif obj-$(CONFIG_MUIC_MAX8997) += max8997-muic.o obj-$(CONFIG_PN544) += pn544.o obj-$(CONFIG_FM34_WE395) += fm34_we395.o obj-$(CONFIG_AUDIENCE_ES305) += es305.o obj-y += 2mic/ +obj-$(CONFIG_SLP_PROCESS_MON) += slp_process_monitor.o +obj-$(CONFIG_SLP_LOWMEM_NOTIFY) += slp_lowmem_notify.o + obj-$(CONFIG_MACH_M0_CTC) += cw_tty.o # Secure OS Mobicore Interface |