diff options
| author | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-10-11 15:39:35 -0400 |
| commit | 56c5d900dbb8e042bfad035d18433476931d8f93 (patch) | |
| tree | 00b793965beeef10db03e0ff021d2d965c410759 /drivers/hwmon/Makefile | |
| parent | 4dd95b63ae25c5cad6986829b5e8788e9faa0330 (diff) | |
| parent | ead9d23d803ea3a73766c3cb27bf7563ac8d7266 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
sound/core/memalloc.c
Diffstat (limited to 'drivers/hwmon/Makefile')
| -rw-r--r-- | drivers/hwmon/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile index ee511ecf1df8..042d5a78622e 100644 --- a/drivers/hwmon/Makefile +++ b/drivers/hwmon/Makefile | |||
| @@ -60,6 +60,7 @@ obj-$(CONFIG_SENSORS_LM87) += lm87.o | |||
| 60 | obj-$(CONFIG_SENSORS_LM90) += lm90.o | 60 | obj-$(CONFIG_SENSORS_LM90) += lm90.o |
| 61 | obj-$(CONFIG_SENSORS_LM92) += lm92.o | 61 | obj-$(CONFIG_SENSORS_LM92) += lm92.o |
| 62 | obj-$(CONFIG_SENSORS_LM93) += lm93.o | 62 | obj-$(CONFIG_SENSORS_LM93) += lm93.o |
| 63 | obj-$(CONFIG_SENSORS_MAX1111) += max1111.o | ||
| 63 | obj-$(CONFIG_SENSORS_MAX1619) += max1619.o | 64 | obj-$(CONFIG_SENSORS_MAX1619) += max1619.o |
| 64 | obj-$(CONFIG_SENSORS_MAX6650) += max6650.o | 65 | obj-$(CONFIG_SENSORS_MAX6650) += max6650.o |
| 65 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o | 66 | obj-$(CONFIG_SENSORS_PC87360) += pc87360.o |