Merge branch 'master' into upstream-fixes

[sfrench/cifs-2.6.git] / drivers / infiniband / hw / amso1100 / c2_ae.c

diff --git a/drivers/infiniband/hw/amso1100/c2_ae.c b/drivers/infiniband/hw/amso1100/c2_ae.c
index 3aae4978e1cbc574eb4e816b2fdb74cc18c7dd55..a31439bd3b67d005c89c3752b0df5a1733b477f1 100644 (file)
--- a/drivers/infiniband/hw/amso1100/c2_ae.c
+++ b/drivers/infiniband/hw/amso1100/c2_ae.c
@@ -66,7 +66,6 @@ static int c2_convert_cm_status(u32 c2_status)
        }
 }
 
-#ifdef DEBUG
 static const char* to_event_str(int event)
 {
        static const char* event_str[] = {
@@ -144,7 +143,6 @@ static const char *to_qp_state_str(int state)
                return "<invalid QP state>";
        };
 }
-#endif
 
 void c2_ae_event(struct c2_dev *c2dev, u32 mq_index)
 {