diff options
author | Namhoon Kim <namhoonk@cs.unc.edu> | 2015-02-26 10:10:13 -0500 |
---|---|---|
committer | Namhoon Kim <namhoonk@cs.unc.edu> | 2015-02-26 10:10:13 -0500 |
commit | f34d9982907644ade66b8689460cf0f414e88ce7 (patch) | |
tree | b1b405bd9bb72c236e8f12042361e0a26c0ec1c4 | |
parent | a83b6b631b081f9dfeb8134c9aee6aeb866f7231 (diff) |
seems working
-rw-r--r-- | drivers/net/ethernet/freescale/fec_main.c | 2 | ||||
-rw-r--r-- | litmus/polling_reservations.c | 2 |
2 files changed, 3 insertions, 1 deletions
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 = { | |||
3390 | .driver = { | 3390 | .driver = { |
3391 | .name = DRIVER_NAME, | 3391 | .name = DRIVER_NAME, |
3392 | .owner = THIS_MODULE, | 3392 | .owner = THIS_MODULE, |
3393 | #ifdef CONFIG_PM | ||
3393 | .pm = &fec_pm_ops, | 3394 | .pm = &fec_pm_ops, |
3395 | #endif | ||
3394 | .of_match_table = fec_dt_ids, | 3396 | .of_match_table = fec_dt_ids, |
3395 | }, | 3397 | }, |
3396 | .id_table = fec_devtype, | 3398 | .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( | |||
363 | switch (res->state) { | 363 | switch (res->state) { |
364 | case RESERVATION_INACTIVE: | 364 | case RESERVATION_INACTIVE: |
365 | case RESERVATION_ACTIVE_IDLE: | 365 | case RESERVATION_ACTIVE_IDLE: |
366 | BUG(); /* INACTIVE or IDLE <=> no client */ | 366 | //BUG(); /* INACTIVE or IDLE <=> no client */ |
367 | break; | 367 | break; |
368 | 368 | ||
369 | case RESERVATION_ACTIVE: | 369 | case RESERVATION_ACTIVE: |