From f34d9982907644ade66b8689460cf0f414e88ce7 Mon Sep 17 00:00:00 2001 From: Namhoon Kim Date: Thu, 26 Feb 2015 10:10:13 -0500 Subject: seems working --- drivers/net/ethernet/freescale/fec_main.c | 2 ++ litmus/polling_reservations.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c index 7b9542846e36..a05b37228101 100644 --- a/drivers/net/ethernet/freescale/fec_main.c +++ b/drivers/net/ethernet/freescale/fec_main.c @@ -3390,7 +3390,9 @@ static struct platform_driver fec_driver = { .driver = { .name = DRIVER_NAME, .owner = THIS_MODULE, +#ifdef CONFIG_PM .pm = &fec_pm_ops, +#endif .of_match_table = fec_dt_ids, }, .id_table = fec_devtype, diff --git a/litmus/polling_reservations.c b/litmus/polling_reservations.c index d2c54c46442c..a3125ebf5273 100644 --- a/litmus/polling_reservations.c +++ b/litmus/polling_reservations.c @@ -363,7 +363,7 @@ static void td_client_departs( switch (res->state) { case RESERVATION_INACTIVE: case RESERVATION_ACTIVE_IDLE: - BUG(); /* INACTIVE or IDLE <=> no client */ + //BUG(); /* INACTIVE or IDLE <=> no client */ break; case RESERVATION_ACTIVE: -- cgit v1.2.2