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
--