Re: mmotm 2008-09-13-03-09 uploaded

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: KAMEZAWA Hiroyuki
Date: Wednesday, September 17, 2008 - 11:01 pm

On Sat, 13 Sep 2008 03:11:29 -0700
akpm@linux-foundation.org wrote:

git-regulator.patch

I'm not so familiar with this HEAD: but is this from git ?

This change

--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -7,6 +7,9 @@ obj-$(CONFIG_REGULATOR) += core.o
 obj-$(CONFIG_REGULATOR_FIXED_VOLTAGE) += fixed.o
 obj-$(CONFIG_REGULATOR_VIRTUAL_CONSUMER) += virtual.o

+<<<<<<< HEAD:drivers/regulator/Makefile
 obj-$(CONFIG_REGULATOR_BQ24022) += bq24022.o

+=======
+>>>>>>> FETCH_HEAD:drivers/regulator/Makefile
 ccflags-$(CONFIG_REGULATOR_DEBUG) += -DDEBUG


stops "make clean"
==
[kamezawa@bluextal mmtom-2.6.26-rc6+]$ make clean
/home/kamezawa/mmtom-2.6.26-rc6+/drivers/regulator/Makefile:13: *** empty variable name.  Stop.
make[1]: *** [drivers/regulator] Error 2
make: *** [_clean_drivers] Error 2

Hmm ? (at build, CONFIG_REGULATOR=n allows me to avoid this.)

Thanks,
-Kame

--
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Re: mmotm 2008-09-13-03-09 uploaded, KAMEZAWA Hiroyuki, (Wed Sep 17, 11:01 pm)
Re: mmotm 2008-09-13-03-09 uploaded, Andrew Morton, (Wed Sep 17, 11:26 pm)
Re: mmotm 2008-09-13-03-09 uploaded, Liam Girdwood, (Thu Sep 18, 1:51 am)
Re: mmotm 2008-09-13-03-09 uploaded, Andrew Morton, (Thu Sep 18, 2:23 am)
Re: mmotm 2008-09-13-03-09 uploaded, Liam Girdwood, (Thu Sep 18, 2:37 am)
Re: mmotm 2008-09-13-03-09 uploaded, Stephen Rothwell, (Thu Sep 18, 10:52 am)
Re: mmotm 2008-09-13-03-09 uploaded, Liam Girdwood, (Thu Sep 18, 1:32 pm)