diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2013-04-05 00:29:26 +0200 |
| commit | 30498b130cc0476e73f5142dcc63bc271da2d89b (patch) | |
| tree | 4719208b11adb08bf484867024642b2f8464d0b4 /patches/collateral-evolutions/network/21-capi-proc_fops | |
| parent | a7a2e992aa2e563c8adb2dec6ddd6e53b1cd9872 (diff) | |
refresh patches against next-20130328
The patches were last refreshed against that same tree,
so the only change is that now we have -p in there, which
results in changes like this (only):
-@@ -1593,7 +1593,7 @@
+@@ -1593,7 +1593,7 @@ static int nl80211_dump_wiphy(struct sk_
This makes the patches more readable.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/collateral-evolutions/network/21-capi-proc_fops')
| -rw-r--r-- | patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch b/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch index c733cc60..7bc09caa 100644 --- a/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch +++ b/patches/collateral-evolutions/network/21-capi-proc_fops/net_bluetooth_cmtp_capi.patch @@ -11,7 +11,7 @@ #include <linux/types.h> #include <linux/errno.h> #include <linux/kernel.h> -@@ -522,6 +524,7 @@ +@@ -522,6 +524,7 @@ static char *cmtp_procinfo(struct capi_c return "CAPI Message Transport Protocol"; } @@ -19,7 +19,7 @@ static int cmtp_proc_show(struct seq_file *m, void *v) { struct capi_ctr *ctrl = m->private; -@@ -554,6 +557,36 @@ +@@ -554,6 +557,36 @@ static const struct file_operations cmtp .release = single_release, }; @@ -56,7 +56,7 @@ int cmtp_attach_device(struct cmtp_session *session) { unsigned char buf[4]; -@@ -592,7 +625,11 @@ +@@ -592,7 +625,11 @@ int cmtp_attach_device(struct cmtp_sessi session->ctrl.send_message = cmtp_send_message; session->ctrl.procinfo = cmtp_procinfo; |