The patch titled
wm97xx: fix module build error with battery driver
has been added to the -mm tree. Its filename is
wm97xx-fix-module-build-error-with-battery-driver.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://userweb.kernel.org/~akpm/added-to-mm.txt to find
out what to do about this
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: wm97xx: fix module build error with battery driver
From: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
I had
CONFIG_TOUCHSCREEN_WM97XX=m
CONFIG_BATTERY_WM97XX=y
and the build failed with
drivers/built-in.o: In function `wm97xx_bat_get_property':
wm97xx_battery.c:(.text+0x76144): undefined reference to `wm97xx_read_aux_adc'
wm97xx_battery.c:(.text+0x761ff): undefined reference to `wm97xx_read_aux_adc'
make: *** [.tmp_vmlinux1] Error 1
which is quite understandable.
Since the battery driver appears to be a fully functional module
this patch changes the Makefile to let it be built as such.
Signed-off-by: Herbert Xu <herbert@xxxxxxxxxxxxxxxxxxx>
Cc: Russell King <rmk+kernel@xxxxxxxxxxxxxxxx>
Cc: Marek Vasut <marek.vasut@xxxxxxxxx>
Cc: Anton Vorontsov <cbouatmailru@xxxxxxxxx>
Cc: Mark Brown <broonie@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/power/Makefile | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff -puN drivers/power/Makefile~wm97xx-fix-module-build-error-with-battery-driver drivers/power/Makefile
--- a/drivers/power/Makefile~wm97xx-fix-module-build-error-with-battery-driver
+++ a/drivers/power/Makefile
@@ -21,4 +21,8 @@ obj-$(CONFIG_BATTERY_DS2760) += ds2760_b
obj-$(CONFIG_BATTERY_PMU) += pmu_battery.o
obj-$(CONFIG_BATTERY_OLPC) += olpc_battery.o
obj-$(CONFIG_BATTERY_TOSA) += tosa_battery.o
-obj-$(CONFIG_BATTERY_WM97XX) += wm97xx_battery.o
\ No newline at end of file
+
+ifeq ($(CONFIG_BATTERY_WM97XX),y)
+obj-$(CONFIG_TOUCHSCREEN_WM97XX) += wm97xx_battery.o
+endif
+
_
Patches currently in -mm which might be from herbert@xxxxxxxxxxxxxxxxxxx are
origin.patch
wm97xx-fix-module-build-error-with-battery-driver.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
