Merge branch 'for-3.12-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj...

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / power / bq24190_charger.c

diff --git a/drivers/power/bq24190_charger.c b/drivers/power/bq24190_charger.c
index 2b0f0e0..ad3ff8f 100644 (file)
--- 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),