mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-30 11:41:38 -04:00
Merge commit 'v2.6.28-rc2' into topic/asoc
This commit is contained in:
commit
7b3b6e4203
7997 changed files with 640082 additions and 197451 deletions
|
|
@ -43,9 +43,6 @@
|
|||
#ifdef CONFIG_PCI
|
||||
struct pci_dev;
|
||||
#endif
|
||||
#ifdef CONFIG_SBUS
|
||||
struct sbus_dev;
|
||||
#endif
|
||||
|
||||
/* device allocation stuff */
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ struct snd_dma_device {
|
|||
#ifndef snd_dma_pci_data
|
||||
#define snd_dma_pci_data(pci) (&(pci)->dev)
|
||||
#define snd_dma_isa_data() NULL
|
||||
#define snd_dma_sbus_data(sbus) ((struct device *)(sbus))
|
||||
#define snd_dma_continuous_data(x) ((struct device *)(unsigned long)(x))
|
||||
#endif
|
||||
|
||||
|
|
@ -49,7 +48,6 @@ struct snd_dma_device {
|
|||
#define SNDRV_DMA_TYPE_CONTINUOUS 1 /* continuous no-DMA memory */
|
||||
#define SNDRV_DMA_TYPE_DEV 2 /* generic device continuous */
|
||||
#define SNDRV_DMA_TYPE_DEV_SG 3 /* generic device SG-buffer */
|
||||
#define SNDRV_DMA_TYPE_SBUS 4 /* SBUS continuous */
|
||||
|
||||
/*
|
||||
* info for buffer allocation
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ struct snd_tea575x {
|
|||
unsigned int freq_fixup; /* crystal onboard */
|
||||
unsigned int val; /* hw value */
|
||||
unsigned long freq; /* frequency */
|
||||
unsigned long in_use; /* set if the device is in use */
|
||||
struct snd_tea575x_ops *ops;
|
||||
void *private_data;
|
||||
};
|
||||
|
|
|
|||
Loading…
Reference in a new issue