Commit 00610a81 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'topic/usb-caiaq' into for-linus 

* topic/usb-caiaq:
  ALSA: snd-usb-caiaq: rename files to remove redundant information in file pathes
  ALSA: snd-usb-caiaq: clean up header includes
parents 035f5afb 936e7d03

sound/usb/caiaq/Makefile

+2 −2
Original line number Diff line number Diff line 
snd-usb-caiaq-y := caiaq-device.o caiaq-audio.o caiaq-midi.o caiaq-control.o

snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += caiaq-input.o

snd-usb-caiaq-y := device.o audio.o midi.o control.o

snd-usb-caiaq-$(CONFIG_SND_USB_CAIAQ_INPUT) += input.o



obj-$(CONFIG_SND_USB_CAIAQ) += snd-usb-caiaq.o

sound/usb/caiaq/caiaq-audio.c→sound/usb/caiaq/audio.c

+3 −9
Original line number Diff line number Diff line
@@ -16,20 +16,14 @@ 
 *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

*/



#include <linux/spinlock.h>

#include <linux/init.h>

#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/interrupt.h>

#include <linux/usb.h>

#include <linux/spinlock.h>

#include <sound/core.h>

#include <sound/initval.h>

#include <sound/pcm.h>

#include <sound/rawmidi.h>

#include <linux/input.h>



#include "caiaq-device.h"

#include "caiaq-audio.h"

#include "device.h"

#include "audio.h"



#define N_URBS			32

#define CLOCK_DRIFT_TOLERANCE	5

sound/usb/caiaq/caiaq-control.c→sound/usb/caiaq/control.c

+3 −7
Original line number Diff line number Diff line
@@ -18,17 +18,13 @@ 
 */



#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/usb.h>

#include <sound/control.h>

#include <sound/core.h>

#include <sound/initval.h>

#include <sound/pcm.h>

#include <sound/rawmidi.h>

#include <sound/control.h>

#include <linux/input.h>



#include "caiaq-device.h"

#include "caiaq-control.h"

#include "device.h"

#include "control.h"



#define CNT_INTVAL 0x10000