Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux...

[karo-tx-linux.git] / drivers / staging / hv / channel_mgmt.h

diff --git a/drivers/staging/hv/channel_mgmt.h b/drivers/staging/hv/channel_mgmt.h
index 5908b81d3e9c044ac1d35583e8355016a00f8516..f969267895be6d20ecee417840b3a35a03d24497 100644 (file)
--- a/drivers/staging/hv/channel_mgmt.h
+++ b/drivers/staging/hv/channel_mgmt.h
@@ -247,8 +247,8 @@ struct vmbus_channel {
        /* Allocated memory for ring buffer */
        void *RingBufferPages;
        u32 RingBufferPageCount;
-       RING_BUFFER_INFO Outbound;      /* send to parent */
-       RING_BUFFER_INFO Inbound;       /* receive from parent */
+       struct hv_ring_buffer_info Outbound;    /* send to parent */
+       struct hv_ring_buffer_info Inbound;     /* receive from parent */
        spinlock_t inbound_lock;
        struct workqueue_struct *ControlWQ;
 
@@ -272,8 +272,8 @@ struct vmbus_channel_debug_info {
        u32 ClientMonitorLatency;
        u32 ClientMonitorConnectionId;
 
-       RING_BUFFER_DEBUG_INFO Inbound;
-       RING_BUFFER_DEBUG_INFO Outbound;
+       struct hv_ring_buffer_debug_info Inbound;
+       struct hv_ring_buffer_debug_info Outbound;
 };
 
 /*