]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
megaraid_sas: fix TRUE and FALSE re-define build error
authorSuthikulpanit, Suravee <Suravee.Suthikulpanit@amd.com>
Wed, 10 Jun 2015 16:08:57 +0000 (11:08 -0500)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 16 Mar 2016 13:33:41 +0000 (06:33 -0700)
Orabug: 22620626

Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Cc: Kashyap Desai <kashyap.desai@avagotech.com>
Cc: Sumit Saxena <sumit.saxena@avagotech.com>
Cc: Uday Lingala <uday.lingala@avagotech.com>
Acked-by: Sumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
(cherry picked from commit ad466c6c1edd3deac6deda3885f12d0b05efac11)
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/megaraid/megaraid_sas_fp.c

index 2001ffb181d5613602ee50ae67b597605382ab6a..be57b18675a4b1b96243e067a71cd2db2a80c1c5 100644 (file)
@@ -66,7 +66,15 @@ MODULE_PARM_DESC(lb_pending_cmds, "Change raid-1 load balancing outstanding "
 
 #define ABS_DIFF(a, b)   (((a) > (b)) ? ((a) - (b)) : ((b) - (a)))
 #define MR_LD_STATE_OPTIMAL 3
+
+#ifdef FALSE
+#undef FALSE
+#endif
 #define FALSE 0
+
+#ifdef TRUE
+#undef TRUE
+#endif
 #define TRUE 1
 
 #define SPAN_DEBUG 0