diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 17:47:59 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-10 17:47:59 -0400 |
| commit | 5f60cfd932b42c69ed3226400cb5eab152576c3a (patch) | |
| tree | 70e4feba5158e76060d36a6c015be8297c294bca /drivers/w1/slaves/Makefile | |
| parent | 9f9d76321659b5ebc9939101481f7c3ce228ea6e (diff) | |
| parent | d7ce6d1d5f6e307a2fbb69626cf120e20e793fe7 (diff) | |
Merge git://git.infradead.org/~dwmw2/battery-2.6
* git://git.infradead.org/~dwmw2/battery-2.6:
[BATTERY] ds2760 W1 slave
[BATTERY] One Laptop Per Child power/battery driver
[BATTERY] Apple PMU driver
[BATTERY] 1-Wire ds2760 chip battery driver
[BATTERY] APM emulation driver for class batteries
[BATTERY] pda_power platform driver
[BATTERY] Universal power supply class (was: battery class)
Diffstat (limited to 'drivers/w1/slaves/Makefile')
| -rw-r--r-- | drivers/w1/slaves/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/w1/slaves/Makefile b/drivers/w1/slaves/Makefile index 725dcfdfddb4..a8eb7524df1d 100644 --- a/drivers/w1/slaves/Makefile +++ b/drivers/w1/slaves/Makefile | |||
| @@ -5,4 +5,5 @@ | |||
| 5 | obj-$(CONFIG_W1_SLAVE_THERM) += w1_therm.o | 5 | obj-$(CONFIG_W1_SLAVE_THERM) += w1_therm.o |
| 6 | obj-$(CONFIG_W1_SLAVE_SMEM) += w1_smem.o | 6 | obj-$(CONFIG_W1_SLAVE_SMEM) += w1_smem.o |
| 7 | obj-$(CONFIG_W1_SLAVE_DS2433) += w1_ds2433.o | 7 | obj-$(CONFIG_W1_SLAVE_DS2433) += w1_ds2433.o |
| 8 | obj-$(CONFIG_W1_SLAVE_DS2760) += w1_ds2760.o | ||
| 8 | 9 | ||