diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-02-01 00:16:22 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-02-01 00:16:22 -0500 |
| commit | a1f3d4bba8ea395a39d34ade6017afee8be16031 (patch) | |
| tree | 874d843d35622f17aa6c3e048e42cf0d679bcb75 /include/net/caif/cfctrl.h | |
| parent | 723d928417bffff6467da155d8ebbbe016464012 (diff) | |
| parent | ebf53826e105f488f4f628703a108e98940d1dc5 (diff) | |
Merge commit 'v2.6.38-rc3' into next
Diffstat (limited to 'include/net/caif/cfctrl.h')
| -rw-r--r-- | include/net/caif/cfctrl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/caif/cfctrl.h b/include/net/caif/cfctrl.h index 9402543fc20d..e54f6396fa4c 100644 --- a/include/net/caif/cfctrl.h +++ b/include/net/caif/cfctrl.h | |||
| @@ -51,7 +51,7 @@ struct cfctrl_rsp { | |||
| 51 | void (*restart_rsp)(void); | 51 | void (*restart_rsp)(void); |
| 52 | void (*radioset_rsp)(void); | 52 | void (*radioset_rsp)(void); |
| 53 | void (*reject_rsp)(struct cflayer *layer, u8 linkid, | 53 | void (*reject_rsp)(struct cflayer *layer, u8 linkid, |
| 54 | struct cflayer *client_layer);; | 54 | struct cflayer *client_layer); |
| 55 | }; | 55 | }; |
| 56 | 56 | ||
| 57 | /* Link Setup Parameters for CAIF-Links. */ | 57 | /* Link Setup Parameters for CAIF-Links. */ |