diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:59:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-25 11:59:42 -0400 |
| commit | 22e12bbc9bc38c6d0bd541d061a0f547596fc19d (patch) | |
| tree | 39b93f43b482c5b4cb9d99933384a8a7fcb85d71 /drivers/Makefile | |
| parent | 19426a8f810752b4218e59b1e2187f33e255f7bc (diff) | |
| parent | 86ff9baadf16c8a1b452d72f5585be63457d9b15 (diff) | |
Merge branch 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-ptp-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
ptp: Fix dp83640 build warning when building statically
ptp: Added a clock driver for the National Semiconductor PHYTER.
ptp: Added a clock driver for the IXP46x.
ptp: Added a clock that uses the eTSEC found on the MPC85xx.
ptp: Added a brand new class driver for ptp clocks.
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index bceb60c85c01..6b17f5864340 100644 --- a/drivers/Makefile +++ b/drivers/Makefile | |||
| @@ -75,6 +75,7 @@ obj-$(CONFIG_I2O) += message/ | |||
| 75 | obj-$(CONFIG_RTC_LIB) += rtc/ | 75 | obj-$(CONFIG_RTC_LIB) += rtc/ |
| 76 | obj-y += i2c/ media/ | 76 | obj-y += i2c/ media/ |
| 77 | obj-$(CONFIG_PPS) += pps/ | 77 | obj-$(CONFIG_PPS) += pps/ |
| 78 | obj-$(CONFIG_PTP_1588_CLOCK) += ptp/ | ||
| 78 | obj-$(CONFIG_W1) += w1/ | 79 | obj-$(CONFIG_W1) += w1/ |
| 79 | obj-$(CONFIG_POWER_SUPPLY) += power/ | 80 | obj-$(CONFIG_POWER_SUPPLY) += power/ |
| 80 | obj-$(CONFIG_HWMON) += hwmon/ | 81 | obj-$(CONFIG_HWMON) += hwmon/ |