diff options
| author | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2011-01-12 18:06:06 -0500 |
| commit | 56dbed129df3fdd4caf9018b6e7599ee258a5420 (patch) | |
| tree | b902491aef3a99efe0d9d49edd0f6e414dba654f /include/net/caif/cfctrl.h | |
| parent | 2a2d31c8dc6f1ebcf5eab1d93a0cb0fb4ed57c7c (diff) | |
| parent | f878133bf022717b880d0e0995b8f91436fd605c (diff) | |
Merge branch 'linus' into idle-test
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. */ |