1 files changed, 1 insertions, 49 deletions

diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
index ccaaac45fafb..3733351a27f2 100644
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -33,9 +33,6 @@
 #include <linux/moduleparam.h>
 #include <linux/mutex.h>
 #include <sound/memalloc.h>
-#ifdef CONFIG_SBUS
-#include <asm/sbus.h>
-#endif
 
 
 MODULE_AUTHOR("Takashi Iwai <tiwai@suse.de>, Jaroslav Kysela <perex@perex.cz>");
@@ -180,41 +177,6 @@ static void snd_free_dev_pages(struct device *dev, size_t size, void *ptr,
 }
 #endif /* CONFIG_HAS_DMA */
 
-#ifdef CONFIG_SBUS
-
-static void *snd_malloc_sbus_pages(struct device *dev, size_t size,
-                                   dma_addr_t *dma_addr)
-{
-        struct sbus_dev *sdev = (struct sbus_dev *)dev;
-        int pg;
-        void *res;
-
-        snd_assert(size > 0, return NULL);
-        snd_assert(dma_addr != NULL, return NULL);
-        pg = get_order(size);
-        res = dma_alloc_coherent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg),
-                                 dma_addr, GFP_ATOMIC);
-        if (res != NULL)
-                inc_snd_pages(pg);
-        return res;
-}
-
-static void snd_free_sbus_pages(struct device *dev, size_t size,
-                                void *ptr, dma_addr_t dma_addr)
-{
-        struct sbus_dev *sdev = (struct sbus_dev *)dev;
-        int pg;
-
-        if (ptr == NULL)
-                return;
-        pg = get_order(size);
-        dec_snd_pages(pg);
-        dma_free_coherent(&sdev->ofdev.dev, PAGE_SIZE * (1 << pg),
-                          ptr, dma_addr);
-}
-
-#endif /* CONFIG_SBUS */
-
 /*
  *
  *  ALSA generic memory management
@@ -249,11 +211,6 @@ int snd_dma_alloc_pages(int type, struct device *device, size_t size,
                 dmab->area = snd_malloc_pages(size, (unsigned long)device);
                 dmab->addr = 0;
                 break;
-#ifdef CONFIG_SBUS
-        case SNDRV_DMA_TYPE_SBUS:
-                dmab->area = snd_malloc_sbus_pages(device, size, &dmab->addr);
-                break;
-#endif
 #ifdef CONFIG_HAS_DMA
         case SNDRV_DMA_TYPE_DEV:
                 dmab->area = snd_malloc_dev_pages(device, size, &dmab->addr);
@@ -322,11 +279,6 @@ void snd_dma_free_pages(struct snd_dma_buffer *dmab)
         case SNDRV_DMA_TYPE_CONTINUOUS:
                 snd_free_pages(dmab->area, dmab->bytes);
                 break;
-#ifdef CONFIG_SBUS
-        case SNDRV_DMA_TYPE_SBUS:
-                snd_free_sbus_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
-                break;
-#endif
 #ifdef CONFIG_HAS_DMA
         case SNDRV_DMA_TYPE_DEV:
                 snd_free_dev_pages(dmab->dev.dev, dmab->bytes, dmab->area, dmab->addr);
@@ -433,7 +385,7 @@ static int snd_mem_proc_read(struct seq_file *seq, void *offset)
         long pages = snd_allocated_pages >> (PAGE_SHIFT-12);
         struct snd_mem_list *mem;
         int devno;
-        static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG", "SBUS" };
+        static char *types[] = { "UNKNOWN", "CONT", "DEV", "DEV-SG" };
 
         mutex_lock(&list_mutex);
         seq_printf(seq, "pages  : %li bytes (%li pages per %likB)\n",