diff options
| author | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2013-01-15 15:05:59 -0500 |
| commit | 4b87f922598acf91eee18f71688a33f54f57bcde (patch) | |
| tree | 9cdfe30c6b96c47093da5392ed82d147290cd64c /drivers/rtc/Makefile | |
| parent | 55eb555d9674e2ebe9d4de0146602f96ff18e7d6 (diff) | |
| parent | daf3ec688e057f6060fb9bb0819feac7a8bbf45c (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
Documentation/networking/ip-sysctl.txt
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
Both conflicts were simply overlapping context.
A build fix for qlcnic is in here too, simply removing the added
devinit annotations which no longer exist.
Signed-off-by: David S. Miller <davem@davemloft.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 c3f62c80dc06..4418ef3f9ecc 100644 --- a/drivers/rtc/Makefile +++ b/drivers/rtc/Makefile | |||
| @@ -111,6 +111,7 @@ obj-$(CONFIG_RTC_DRV_TEGRA) += rtc-tegra.o | |||
| 111 | obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o | 111 | obj-$(CONFIG_RTC_DRV_TEST) += rtc-test.o |
| 112 | obj-$(CONFIG_RTC_DRV_TILE) += rtc-tile.o | 112 | obj-$(CONFIG_RTC_DRV_TILE) += rtc-tile.o |
| 113 | obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl.o | 113 | obj-$(CONFIG_RTC_DRV_TWL4030) += rtc-twl.o |
| 114 | obj-$(CONFIG_RTC_DRV_TPS6586X) += rtc-tps6586x.o | ||
| 114 | obj-$(CONFIG_RTC_DRV_TPS65910) += rtc-tps65910.o | 115 | obj-$(CONFIG_RTC_DRV_TPS65910) += rtc-tps65910.o |
| 115 | obj-$(CONFIG_RTC_DRV_TX4939) += rtc-tx4939.o | 116 | obj-$(CONFIG_RTC_DRV_TX4939) += rtc-tx4939.o |
| 116 | obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o | 117 | obj-$(CONFIG_RTC_DRV_V3020) += rtc-v3020.o |