summaryrefslogtreecommitdiffstats
path: root/drivers/power
diff options
context:
space:
mode:
authorAnton Vorontsov <anton@enomsg.org>2013-08-28 17:45:07 -0700
committerAnton Vorontsov <anton@enomsg.org>2013-08-28 17:52:50 -0700
commitd24fed391dc50f68d27a57364e51888b3a9266b6 (patch)
treee7ace10e1d8e3d707932de1ac689a45e5b56085d /drivers/power
parent948dcf96622814d2a850a12851d27824530a9747 (diff)
downloadlinux-d24fed391dc50f68d27a57364e51888b3a9266b6.tar.gz
linux-d24fed391dc50f68d27a57364e51888b3a9266b6.tar.bz2
linux-d24fed391dc50f68d27a57364e51888b3a9266b6.zip
bq24190_charger: Workaround SS definition problem on i386 builds
For __i386__ builds we have: arch/x86/include/uapi/asm/ptrace-abi.h:#define SS 16 And in the driver: BQ24190_SYSFS_FIELD_RO(vbus_stat, SS, VBUS_STAT) That breaks the build like this: drivers/power/bq24190_charger.c:375:138: error: ‘BQ24190_REG_16’ undeclared here (not in a function) drivers/power/bq24190_charger.c:375:162: error: ‘BQ24190_REG_16_THERM_STAT_MASK’ undeclared here (not in a function) drivers/power/bq24190_charger.c:375:203: error: ‘BQ24190_REG_16_THERM_STAT_SHIFT’ undeclared here (not in a function) With this commit we workaround the problem by undefining 'SS'. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Anton Vorontsov <anton@enomsg.org>
Diffstat (limited to 'drivers/power')
-rw-r--r--drivers/power/bq24190_charger.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/power/bq24190_charger.c b/drivers/power/bq24190_charger.c
index 2b0f0e0b58a2..ad3ff8fbfbbb 100644
--- a/drivers/power/bq24190_charger.c
+++ b/drivers/power/bq24190_charger.c
@@ -339,6 +339,9 @@ struct bq24190_sysfs_field_info {
u8 shift;
};
+/* On i386 ptrace-abi.h defines SS that breaks the macro calls below. */
+#undef SS
+
static struct bq24190_sysfs_field_info bq24190_sysfs_field_tbl[] = {
/* sysfs name reg field in reg */
BQ24190_SYSFS_FIELD_RW(en_hiz, ISC, EN_HIZ),