From 45184d0600c148d3629897b2ea2d91de26a486c6 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 5 May 2010 22:22:35 -0700 Subject: [PATCH] --- yaml --- r: 197323 b: refs/heads/master c: 8f078ca6e7e1a5457aef5196e7154aa468094120 h: refs/heads/master i: 197321: f90a9064eedf6a8d8b2e52d3de66076a30326865 197319: 25f7daf3777a108071d05c685fb825a797c00ae0 v: v3 --- [refs] | 2 +- trunk/drivers/staging/hv/ChannelMgmt.h | 2 +- trunk/drivers/staging/hv/Makefile | 2 +- trunk/drivers/staging/hv/VmbusPrivate.h | 2 +- trunk/drivers/staging/hv/{RingBuffer.c => ring_buffer.c} | 2 +- trunk/drivers/staging/hv/{RingBuffer.h => ring_buffer.h} | 0 6 files changed, 5 insertions(+), 5 deletions(-) rename trunk/drivers/staging/hv/{RingBuffer.c => ring_buffer.c} (99%) rename trunk/drivers/staging/hv/{RingBuffer.h => ring_buffer.h} (100%) diff --git a/[refs] b/[refs] index af76e7cdf2ad..1f3c93b03a67 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 55e9643e6c486b589279576877838ffd8ed04a68 +refs/heads/master: 8f078ca6e7e1a5457aef5196e7154aa468094120 diff --git a/trunk/drivers/staging/hv/ChannelMgmt.h b/trunk/drivers/staging/hv/ChannelMgmt.h index fa973d86b624..9219199d0e5a 100644 --- a/trunk/drivers/staging/hv/ChannelMgmt.h +++ b/trunk/drivers/staging/hv/ChannelMgmt.h @@ -27,7 +27,7 @@ #include #include -#include "RingBuffer.h" +#include "ring_buffer.h" #include "VmbusChannelInterface.h" #include "VmbusPacketFormat.h" diff --git a/trunk/drivers/staging/hv/Makefile b/trunk/drivers/staging/hv/Makefile index 91955095f9e8..faa8db1d86c0 100644 --- a/trunk/drivers/staging/hv/Makefile +++ b/trunk/drivers/staging/hv/Makefile @@ -6,7 +6,7 @@ obj-$(CONFIG_HYPERV_UTILS) += hv_utils.o hv_vmbus-objs := vmbus_drv.o osd.o \ Vmbus.o hv.o connection.o channel.o \ - ChannelMgmt.o ChannelInterface.o RingBuffer.o + ChannelMgmt.o ChannelInterface.o ring_buffer.o hv_storvsc-objs := storvsc_drv.o StorVsc.o hv_blkvsc-objs := blkvsc_drv.o BlkVsc.o hv_netvsc-objs := netvsc_drv.o NetVsc.o RndisFilter.o diff --git a/trunk/drivers/staging/hv/VmbusPrivate.h b/trunk/drivers/staging/hv/VmbusPrivate.h index f03db0b6e887..d73baff99a7e 100644 --- a/trunk/drivers/staging/hv/VmbusPrivate.h +++ b/trunk/drivers/staging/hv/VmbusPrivate.h @@ -30,7 +30,7 @@ #include "channel.h" #include "ChannelMgmt.h" #include "ChannelInterface.h" -#include "RingBuffer.h" +#include "ring_buffer.h" #include diff --git a/trunk/drivers/staging/hv/RingBuffer.c b/trunk/drivers/staging/hv/ring_buffer.c similarity index 99% rename from trunk/drivers/staging/hv/RingBuffer.c rename to trunk/drivers/staging/hv/ring_buffer.c index 64f8d0f9e05c..ae2a10e24d92 100644 --- a/trunk/drivers/staging/hv/RingBuffer.c +++ b/trunk/drivers/staging/hv/ring_buffer.c @@ -25,7 +25,7 @@ #include #include "osd.h" #include "logging.h" -#include "RingBuffer.h" +#include "ring_buffer.h" /* #defines */ diff --git a/trunk/drivers/staging/hv/RingBuffer.h b/trunk/drivers/staging/hv/ring_buffer.h similarity index 100% rename from trunk/drivers/staging/hv/RingBuffer.h rename to trunk/drivers/staging/hv/ring_buffer.h