diff options
| author | David Binder <david.binder@unisys.com> | 2016-09-02 23:41:33 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-12 14:26:29 +0300 |
| commit | d6d0c6f444a82a792cef1be5860255bd1cae93bb (patch) | |
| tree | f58429586b625c98f4020cd2e93dbf8b8c79d354 /drivers/staging/unisys/include/iochannel.h | |
| parent | 7339cb09a91ea316b6b84944910a2869abfc7fea (diff) | |
| download | linux-d6d0c6f444a82a792cef1be5860255bd1cae93bb.tar.xz | |
staging: unisys: visorbus: Merge channel_guid.h with channel.h
Merges the contents of channel_guid.h with channel.h, as the former was
not a proper header file. Therefore, the channel_guid.h is no longer
needed.
Signed-off-by: David Binder <david.binder@unisys.com>
Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Tim Sell <Timothy.Sell@unisys.com>
Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/unisys/include/iochannel.h')
| -rw-r--r-- | drivers/staging/unisys/include/iochannel.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/staging/unisys/include/iochannel.h b/drivers/staging/unisys/include/iochannel.h index 5ccf81485d72..cba4433bcd51 100644 --- a/drivers/staging/unisys/include/iochannel.h +++ b/drivers/staging/unisys/include/iochannel.h @@ -33,7 +33,6 @@ #include <linux/dma-direction.h> #include "channel.h" -#include "channel_guid.h" #define ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE #define ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE ULTRA_CHANNEL_PROTOCOL_SIGNATURE |