From aaf1173277a95da7e566312803d50feb32269c9c Mon Sep 17 00:00:00 2001
From: Jassi Brar <jaswinder.singh@linaro.org>
Date: Thu, 2 Feb 2012 21:59:53 +0530
Subject: [PATCH] --- yaml --- r: 289582 b: refs/heads/master c:
 18b5b3b55f44c28a0380f3559d1db3c467f94b4a h: refs/heads/master v: v3

---
 [refs]                                           | 2 +-
 trunk/drivers/usb/gadget/audio.c                 | 6 +++---
 trunk/drivers/usb/gadget/{f_audio.c => f_uac1.c} | 2 +-
 trunk/drivers/usb/gadget/{u_audio.c => u_uac1.c} | 4 ++--
 trunk/drivers/usb/gadget/{u_audio.h => u_uac1.h} | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename trunk/drivers/usb/gadget/{f_audio.c => f_uac1.c} (99%)
 rename trunk/drivers/usb/gadget/{u_audio.c => u_uac1.c} (99%)
 rename trunk/drivers/usb/gadget/{u_audio.h => u_uac1.h} (94%)

diff --git a/[refs] b/[refs]
index a4916765f56d..3fe0d01f2be6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6e4b74e4690dd03b5664fa4895c3db0607d64742
+refs/heads/master: 18b5b3b55f44c28a0380f3559d1db3c467f94b4a
diff --git a/trunk/drivers/usb/gadget/audio.c b/trunk/drivers/usb/gadget/audio.c
index 9d89ae4765a9..056a2d936d7f 100644
--- a/trunk/drivers/usb/gadget/audio.c
+++ b/trunk/drivers/usb/gadget/audio.c
@@ -14,7 +14,7 @@
 #include <linux/kernel.h>
 #include <linux/utsname.h>
 
-#include "u_audio.h"
+#include "u_uac1.h"
 
 #define DRIVER_DESC		"Linux USB Audio Gadget"
 #define DRIVER_VERSION		"Dec 18, 2008"
@@ -33,8 +33,8 @@
 #include "config.c"
 #include "epautoconf.c"
 
-#include "u_audio.c"
-#include "f_audio.c"
+#include "u_uac1.c"
+#include "f_uac1.c"
 
 /*-------------------------------------------------------------------------*/
 
diff --git a/trunk/drivers/usb/gadget/f_audio.c b/trunk/drivers/usb/gadget/f_uac1.c
similarity index 99%
rename from trunk/drivers/usb/gadget/f_audio.c
rename to trunk/drivers/usb/gadget/f_uac1.c
index ec7ffcd0d0cd..e4c060fd81e4 100644
--- a/trunk/drivers/usb/gadget/f_audio.c
+++ b/trunk/drivers/usb/gadget/f_uac1.c
@@ -14,7 +14,7 @@
 #include <linux/device.h>
 #include <linux/atomic.h>
 
-#include "u_audio.h"
+#include "u_uac1.h"
 
 #define OUT_EP_MAX_PACKET_SIZE	200
 static int req_buf_size = OUT_EP_MAX_PACKET_SIZE;
diff --git a/trunk/drivers/usb/gadget/u_audio.c b/trunk/drivers/usb/gadget/u_uac1.c
similarity index 99%
rename from trunk/drivers/usb/gadget/u_audio.c
rename to trunk/drivers/usb/gadget/u_uac1.c
index 59ffe1ecf1c9..af9898982059 100644
--- a/trunk/drivers/usb/gadget/u_audio.c
+++ b/trunk/drivers/usb/gadget/u_uac1.c
@@ -1,5 +1,5 @@
 /*
- * u_audio.c -- ALSA audio utilities for Gadget stack
+ * u_uac1.c -- ALSA audio utilities for Gadget stack
  *
  * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
  * Copyright (C) 2008 Analog Devices, Inc
@@ -17,7 +17,7 @@
 #include <linux/random.h>
 #include <linux/syscalls.h>
 
-#include "u_audio.h"
+#include "u_uac1.h"
 
 /*
  * This component encapsulates the ALSA devices for USB audio gadget
diff --git a/trunk/drivers/usb/gadget/u_audio.h b/trunk/drivers/usb/gadget/u_uac1.h
similarity index 94%
rename from trunk/drivers/usb/gadget/u_audio.h
rename to trunk/drivers/usb/gadget/u_uac1.h
index 08ffce3298e6..18c2e729faf6 100644
--- a/trunk/drivers/usb/gadget/u_audio.h
+++ b/trunk/drivers/usb/gadget/u_uac1.h
@@ -1,5 +1,5 @@
 /*
- * u_audio.h -- interface to USB gadget "ALSA AUDIO" utilities
+ * u_uac1.h -- interface to USB gadget "ALSA AUDIO" utilities
  *
  * Copyright (C) 2008 Bryan Wu <cooloney@kernel.org>
  * Copyright (C) 2008 Analog Devices, Inc