diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-31 17:13:10 +0100 |
| commit | 7b3b6e42032e94a6132a85642e95106f5346650e (patch) | |
| tree | 8b2262291341d8a9f9b1e7e3c63a3289bb6c6de6 /include/sound | |
| parent | 04172c0b9ea5861e5cba7909da5297b3aedac9e1 (diff) | |
| parent | 0173a3265b228da319ceb9c1ec6a5682fd1b2d92 (diff) | |
| download | kernel_samsung_espresso10-7b3b6e42032e94a6132a85642e95106f5346650e.zip kernel_samsung_espresso10-7b3b6e42032e94a6132a85642e95106f5346650e.tar.gz kernel_samsung_espresso10-7b3b6e42032e94a6132a85642e95106f5346650e.tar.bz2 | |
Merge commit 'v2.6.28-rc2' into topic/asoc
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/core.h | 3 | ||||
| -rw-r--r-- | include/sound/memalloc.h | 2 | ||||
| -rw-r--r-- | include/sound/tea575x-tuner.h | 1 |
3 files changed, 1 insertions, 5 deletions
diff --git a/include/sound/core.h b/include/sound/core.h index e5eec5f..35424a9 100644 --- a/include/sound/core.h +++ b/include/sound/core.h @@ -43,9 +43,6 @@ #ifdef CONFIG_PCI struct pci_dev; #endif -#ifdef CONFIG_SBUS -struct sbus_dev; -#endif /* device allocation stuff */ diff --git a/include/sound/memalloc.h b/include/sound/memalloc.h index d787a6b..7ccce94 100644 --- a/include/sound/memalloc.h +++ b/include/sound/memalloc.h @@ -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 diff --git a/include/sound/tea575x-tuner.h b/include/sound/tea575x-tuner.h index b62ce3e..b6870cb 100644 --- a/include/sound/tea575x-tuner.h +++ b/include/sound/tea575x-tuner.h @@ -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; }; |