diff --git a/[refs] b/[refs] index 250ff4649b10..4004712a542c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 82a9c16a10521a0ceadbd27a549f6e8d5e70e0ab +refs/heads/master: 1031bfb93adf641436b2192170525b76e2eb25bd diff --git a/trunk/drivers/infiniband/hw/amso1100/c2_ae.c b/trunk/drivers/infiniband/hw/amso1100/c2_ae.c index 3aae4978e1cb..a31439bd3b67 100644 --- a/trunk/drivers/infiniband/hw/amso1100/c2_ae.c +++ b/trunk/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 ""; }; } -#endif void c2_ae_event(struct c2_dev *c2dev, u32 mq_index) {