Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[mv-sheeva.git] / drivers / staging / hv / ChannelInterface.h

diff --git a/drivers/staging/hv/ChannelInterface.h b/drivers/staging/hv/ChannelInterface.h
index 338591474699aa8caeb5dc9ca190340543c2480a..27b7a253b7114d0613e1b790d51ea1787f576343 100644 (file)
--- a/drivers/staging/hv/ChannelInterface.h
+++ b/drivers/staging/hv/ChannelInterface.h
@@ -25,17 +25,11 @@
 #ifndef _CHANNEL_INTERFACE_H_
 #define _CHANNEL_INTERFACE_H_
 
-#include "include/VmbusApi.h"
+#include "VmbusApi.h"
 
-static void
-GetChannelInterface(
-       VMBUS_CHANNEL_INTERFACE *ChannelInterface
-       );
+void GetChannelInterface(struct vmbus_channel_interface *ChannelInterface);
 
-static void
-GetChannelInfo(
-       struct hv_device *Device,
-       DEVICE_INFO                     *DeviceInfo
-       );
+void GetChannelInfo(struct hv_device *Device,
+                   struct hv_device_info *DeviceInfo);
 
 #endif /* _CHANNEL_INTERFACE_H_ */