diff options
| author | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 13:50:41 +0200 |
|---|---|---|
| committer | Andy Shevchenko <andriy.shevchenko@linux.intel.com> | 2017-11-03 13:50:41 +0200 |
| commit | 7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5 (patch) | |
| tree | 3916e6cf9678a41081ae822ef67ec5cae1c1fffa /include/linux/hyperv.h | |
| parent | 3fcf2b2a2529e268c537d8ad9dac5987ebc8a2f7 (diff) | |
| parent | 0224d45c9d46401b6d7018a96cfe049c5da7d91c (diff) | |
| download | talos-op-linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.tar.gz talos-op-linux-7d9a6ef558f6ff375aab9e29f08124cb0daa9bc5.zip | |
Merge branch 'i2c/cht-wc-fusb302-immutable' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux
Pull i2c/cht-wc-fusb302-immutable immutable branch from Wolfram Sang:
as discussed before, here is the immutable branch for the i2c-cht-wc
driver, so you can safely apply Hans' patch [1]
"platform/x86: intel_cht_int33fe: Update fusb302 type string, add properties"
on top of this.
[1] http://patchwork.ozlabs.org/patch/824314/
Diffstat (limited to 'include/linux/hyperv.h')
| -rw-r--r-- | include/linux/hyperv.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h index c458d7b7ad19..6431087816ba 100644 --- a/include/linux/hyperv.h +++ b/include/linux/hyperv.h @@ -1403,7 +1403,7 @@ extern bool vmbus_prep_negotiate_resp(struct icmsg_hdr *icmsghdrp, u8 *buf, const int *srv_version, int srv_vercnt, int *nego_fw_version, int *nego_srv_version); -void hv_process_channel_removal(struct vmbus_channel *channel, u32 relid); +void hv_process_channel_removal(u32 relid); void vmbus_setevent(struct vmbus_channel *channel); /* |
