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-rx.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-rx.c')
| -rw-r--r-- | drivers/net/wimax/i2400m/sdio-rx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wimax/i2400m/sdio-rx.c b/drivers/net/wimax/i2400m/sdio-rx.c index 8b809c2ead6c..fb6396dd115f 100644 --- a/drivers/net/wimax/i2400m/sdio-rx.c +++ b/drivers/net/wimax/i2400m/sdio-rx.c | |||
| @@ -87,7 +87,7 @@ static const __le32 i2400m_ACK_BARKER[4] = { | |||
| 87 | * | 87 | * |
| 88 | * sdio_readl() doesn't work. | 88 | * sdio_readl() doesn't work. |
| 89 | */ | 89 | */ |
| 90 | ssize_t __i2400ms_rx_get_size(struct i2400ms *i2400ms) | 90 | static ssize_t __i2400ms_rx_get_size(struct i2400ms *i2400ms) |
| 91 | { | 91 | { |
| 92 | int ret, cnt, val; | 92 | int ret, cnt, val; |
| 93 | ssize_t rx_size; | 93 | ssize_t rx_size; |