Merge commit 'v2.6.28-rc2' into topic/asoc

3 files changed, 1 insertions, 5 deletions

diff --git a/include/sound/core.h b/include/sound/core.h
index e5eec5f73502..35424a971b7a 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 d787a6b4a101..7ccce94a5255 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 b62ce3e077f9..b6870cbaf2b3 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;
 };