diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /drivers/net/wimax/i2400m/sdio.c | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'drivers/net/wimax/i2400m/sdio.c')
| -rw-r--r-- | drivers/net/wimax/i2400m/sdio.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/sdio.c b/drivers/net/wimax/i2400m/sdio.c index 9bfc26e1bc6b..be428cae28d8 100644 --- a/drivers/net/wimax/i2400m/sdio.c +++ b/drivers/net/wimax/i2400m/sdio.c | |||
| @@ -590,7 +590,6 @@ module_init(i2400ms_driver_init); | |||
| 590 | static | 590 | static |
| 591 | void __exit i2400ms_driver_exit(void) | 591 | void __exit i2400ms_driver_exit(void) |
| 592 | { | 592 | { |
| 593 | flush_scheduled_work(); /* for the stuff we schedule */ | ||
| 594 | sdio_unregister_driver(&i2400m_sdio_driver); | 593 | sdio_unregister_driver(&i2400m_sdio_driver); |
| 595 | } | 594 | } |
| 596 | module_exit(i2400ms_driver_exit); | 595 | module_exit(i2400ms_driver_exit); |