staging: unisys: visorbus: Merge channel_guid.h with channel.h
authorDavid Binder <david.binder@unisys.com>
Fri, 2 Sep 2016 20:41:33 +0000 (16:41 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 12 Sep 2016 11:26:29 +0000 (13:26 +0200)
commitd6d0c6f444a82a792cef1be5860255bd1cae93bb
treef58429586b625c98f4020cd2e93dbf8b8c79d354
parent7339cb09a91ea316b6b84944910a2869abfc7fea
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>
drivers/staging/unisys/include/channel.h
drivers/staging/unisys/include/channel_guid.h [deleted file]
drivers/staging/unisys/include/iochannel.h
drivers/staging/unisys/visorbus/visorchipset.c