diff options
| author | Olof Johansson <olof@lixom.net> | 2014-01-02 14:32:33 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-02 14:32:33 -0500 |
| commit | 9dc9b8e51f95fce0cc3d50ef80402203d2dcd68a (patch) | |
| tree | 1f98503a04cf6758a81f7945fd466aa668db1dc1 /drivers/rtc/Makefile | |
| parent | c7fed591a6d5ce080482e4237bd02c99857c0d4f (diff) | |
| parent | 70e123373c05e336f3f769b32c6132bdc2d6f5ac (diff) | |
Merge tag 'mvebu-drivers-3.14-2' of git://git.infradead.org/linux-mvebu into next/drivers
From Jason Cooper:
mvebu driver changes for v3.14 (incremental #2)
- rtc
- add driver for Intersil ISL12057 chip
* tag 'mvebu-drivers-3.14-2' of git://git.infradead.org/linux-mvebu:
rtc: Add support for Intersil ISL12057 I2C RTC chip
b the commit.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/rtc/Makefile')
| -rw-r--r-- | drivers/rtc/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index 63f3e9983a45..c00741a0bf10 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile | |||
| @@ -58,6 +58,7 @@ obj-$(CONFIG_RTC_DRV_HID_SENSOR_TIME) += rtc-hid-sensor-time.o | |||
| 58 | obj-$(CONFIG_RTC_DRV_IMXDI) += rtc-imxdi.o | 58 | obj-$(CONFIG_RTC_DRV_IMXDI) += rtc-imxdi.o |
| 59 | obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o | 59 | obj-$(CONFIG_RTC_DRV_ISL1208) += rtc-isl1208.o |
| 60 | obj-$(CONFIG_RTC_DRV_ISL12022) += rtc-isl12022.o | 60 | obj-$(CONFIG_RTC_DRV_ISL12022) += rtc-isl12022.o |
| 61 | obj-$(CONFIG_RTC_DRV_ISL12057) += rtc-isl12057.o | ||
| 61 | obj-$(CONFIG_RTC_DRV_JZ4740) += rtc-jz4740.o | 62 | obj-$(CONFIG_RTC_DRV_JZ4740) += rtc-jz4740.o |
| 62 | obj-$(CONFIG_RTC_DRV_LP8788) += rtc-lp8788.o | 63 | obj-$(CONFIG_RTC_DRV_LP8788) += rtc-lp8788.o |
| 63 | obj-$(CONFIG_RTC_DRV_LPC32XX) += rtc-lpc32xx.o | 64 | obj-$(CONFIG_RTC_DRV_LPC32XX) += rtc-lpc32xx.o |