diff options
author | David Woodhouse <David.Woodhouse@intel.com> | 2010-04-09 16:17:41 +0200 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-04-09 16:21:12 +0200 |
commit | 87d8a69709d971913e6cc7210450fcb8be963667 (patch) | |
tree | 4f8eb95c588f7df84554dcf97d67540664333a7b /drivers/rtc/Makefile | |
parent | intel-iommu: Fix section mismatch dmar_ir_support() uses dmar_tbl. (diff) | |
parent | Linux 2.6.34-rc3 (diff) | |
download | linux-87d8a69709d971913e6cc7210450fcb8be963667.tar.xz linux-87d8a69709d971913e6cc7210450fcb8be963667.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/rtc/Makefile')
-rw-r--r-- | drivers/rtc/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/rtc/Makefile b/drivers/rtc/Makefile index e5160fddc446..44ef194a9573 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile @@ -52,9 +52,11 @@ obj-$(CONFIG_RTC_DRV_M48T59) += rtc-m48t59.o obj-$(CONFIG_RTC_DRV_M48T86) += rtc-m48t86.o obj-$(CONFIG_RTC_MXC) += rtc-mxc.o obj-$(CONFIG_RTC_DRV_MAX6900) += rtc-max6900.o +obj-$(CONFIG_RTC_DRV_MAX8925) += rtc-max8925.o obj-$(CONFIG_RTC_DRV_MAX6902) += rtc-max6902.o obj-$(CONFIG_RTC_DRV_MC13783) += rtc-mc13783.o obj-$(CONFIG_RTC_DRV_MSM6242) += rtc-msm6242.o +obj-$(CONFIG_RTC_DRV_MPC5121) += rtc-mpc5121.o obj-$(CONFIG_RTC_DRV_MV) += rtc-mv.o obj-$(CONFIG_RTC_DRV_NUC900) += rtc-nuc900.o obj-$(CONFIG_RTC_DRV_OMAP) += rtc-omap.o |