These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / staging / unisys / visorbus / vbuschannel.h

diff --git a/kernel/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h b/kernel/drivers/staging/unisys/visorbus/vbuschannel.h
similarity index 92%
rename from kernel/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
rename to kernel/drivers/staging/unisys/visorbus/vbuschannel.h
index 2c42ce1..80e6447 100644 (file)
--- a/kernel/drivers/staging/unisys/common-spar/include/channels/vbuschannel.h
+++ b/kernel/drivers/staging/unisys/visorbus/vbuschannel.h
@@ -1,10 +1,9 @@
-/* Copyright (C) 2010 - 2013 UNISYS CORPORATION
+/* Copyright (C) 2010 - 2015 UNISYS CORPORATION
  * All rights reserved.
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -54,7 +53,7 @@ static const uuid_le spar_vbus_channel_protocol_uuid =
 #define SPAR_VBUS_CHANNEL_OK_SERVER(actual_bytes)    \
        (spar_check_channel_server(spar_vbus_channel_protocol_uuid,     \
                                   "vbus",                              \
-                                  sizeof(struct ultra_vbus_channel_protocol),\
+                                  sizeof(struct spar_vbus_channel_protocol),\
                                   actual_bytes))
 
 #pragma pack(push, 1)          /* both GCC and VC now allow this pragma */