diff options
| author | David S. Miller <davem@davemloft.net> | 2016-01-16 02:36:23 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-01-16 02:36:23 +0300 |
| commit | 7a26019fdecdb45ff784ae4e3b7e0cc9045100ca (patch) | |
| tree | 511474baafa5b5c0b072e88feaa6bb405724b34f /drivers/Makefile | |
| parent | 725da8dee445662beea77d3f42c3f4c79f7a7a0e (diff) | |
| parent | 4e5448a31d73d0e944b7adb9049438a09bc332cb (diff) | |
| download | linux-7a26019fdecdb45ff784ae4e3b7e0cc9045100ca.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/Makefile')
| -rw-r--r-- | drivers/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/Makefile b/drivers/Makefile index 795d0ca714bf..8f5d076baeb0 100644 --- a/drivers/Makefile +++ b/drivers/Makefile @@ -106,7 +106,7 @@ obj-y += i2c/ media/ obj-$(CONFIG_PPS) += pps/ obj-$(CONFIG_PTP_1588_CLOCK) += ptp/ obj-$(CONFIG_W1) += w1/ -obj-$(CONFIG_POWER_SUPPLY) += power/ +obj-y += power/ obj-$(CONFIG_HWMON) += hwmon/ obj-$(CONFIG_THERMAL) += thermal/ obj-$(CONFIG_WATCHDOG) += watchdog/ |