diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-01-17 12:01:12 +0100 |
| commit | d1a020050c6ce1a0794ff73582ccf47e4db536f7 (patch) | |
| tree | 1b7250410f24703cd77c76156e758db9887137aa /drivers/power/Makefile | |
| parent | dc61b66fc724f89d357c43e2319d2cb7bec1e517 (diff) | |
| parent | 641b4879444c0edb276fedca5c2fcbd2e5c70044 (diff) | |
| download | op-kernel-dev-d1a020050c6ce1a0794ff73582ccf47e4db536f7.zip op-kernel-dev-d1a020050c6ce1a0794ff73582ccf47e4db536f7.tar.gz | |
Merge branch 'topic/usb-mixer-cache' into next/usb-audio
Diffstat (limited to 'drivers/power/Makefile')
| -rw-r--r-- | drivers/power/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/power/Makefile b/drivers/power/Makefile index e8f1ece..2fcf41d 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile @@ -16,6 +16,7 @@ obj-$(CONFIG_POWER_SUPPLY) += power_supply.o obj-$(CONFIG_PDA_POWER) += pda_power.o obj-$(CONFIG_APM_POWER) += apm_power.o +obj-$(CONFIG_WM8350_POWER) += wm8350_power.o obj-$(CONFIG_BATTERY_DS2760) += ds2760_battery.o obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o @@ -23,3 +24,5 @@ obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o obj-$(CONFIG_BATTERY_BQ27x00) += bq27x00_battery.o +obj-$(CONFIG_BATTERY_DA9030) += da9030_battery.o +obj-$(CONFIG_CHARGER_PCF50633) += pcf50633-charger.o
\ No newline at end of file |
