lkml.org 
[lkml]   [2011]   [Mar]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
DateFri, 18 Mar 2011 11:48:36 +1100
FromStephen Rothwell <>
Subjectlinux-next: manual merge of the kbuild tree with the hwmon-staging tree
Hi Michal,

Today's linux-next merge of the kbuild tree got a conflict in
drivers/hwmon/Makefile between commit 442aba78728e ("hwmon: PMBus device
driver") from the hwmon-staging tree and commit 5c39e31195f4 ("hwmon:
change to new flag variable") from the kbuild tree.

Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au

diff --cc drivers/hwmon/Makefile
index aaf6ca9,974f9cc..0000000
--- a/drivers/hwmon/Makefile
+++ b/drivers/hwmon/Makefile
@@@ -114,14 -112,5 +114,12 @@@ obj-$(CONFIG_SENSORS_W83L786NG) += w83l
obj-$(CONFIG_SENSORS_WM831X) += wm831x-hwmon.o
obj-$(CONFIG_SENSORS_WM8350) += wm8350-hwmon.o
+# PMBus drivers
+obj-$(CONFIG_PMBUS) += pmbus_core.o
+obj-$(CONFIG_SENSORS_PMBUS) += pmbus.o
+obj-$(CONFIG_SENSORS_MAX16064) += max16064.o
+obj-$(CONFIG_SENSORS_MAX34440) += max34440.o
+obj-$(CONFIG_SENSORS_MAX8688) += max8688.o
+
- ifeq ($(CONFIG_HWMON_DEBUG_CHIP),y)
- EXTRA_CFLAGS += -DDEBUG
- endif
+ ccflags-$(CONFIG_HWMON_DEBUG_CHIP) := -DDEBUG



\
 
 \ /
  Last update: 2011-03-18 01:51    [from the cache]
©2003-2010