Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 47236 | Differences between
and this patch

Collapse All | Expand All

(-)linux-2.6.5-rc1/include/sound/trident.h (-2 / +2 lines)
Lines 56-64 Link Here
56 

          56
          

        

        

          57
          
/* Trident chipsets have 1GB memory limit */

          57
          
/* Trident chipsets have 1GB memory limit */

        

        

          58
          
#ifdef __alpha__

          58
          
#ifdef __alpha__

        

          
            

              59
              
#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_PCI_16MB


              59
              
#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_DEV_16MB

            

        

          60
          
#else

          60
          
#else

        

          
            

              61
              
#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_PCI


              61
              
#define TRIDENT_DMA_TYPE        SNDRV_DMA_TYPE_DEV

            

        

          62
          
#endif

          62
          
#endif

        

        

          63
          

          63
          

        

        

          64
          
#define SNDRV_SEQ_DEV_ID_TRIDENT			"trident-synth"

          64
          
#define SNDRV_SEQ_DEV_ID_TRIDENT			"trident-synth"

        



(-)linux-2.6.5-rc1/sound/isa/cs423x/cs4231_lib.c
      (-1 / +1 lines)




  

    
      
            Lines 1659-1665
          
      
      
        Link Here
      
    
  

        

          1659
          
#else

          1659
          
#else

        

        

          1660
          
#  ifdef EBUS_SUPPORT

          1660
          
#  ifdef EBUS_SUPPORT

        

        

          1661
          
        if (chip->ebus_flag) {

          1661
          
        if (chip->ebus_flag) {

        

          
            

              1662
              
                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,


              1662
              
                snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

            

        

          1663
          
                				      chip->dev_u.pdev,

          1663
          
                				      chip->dev_u.pdev,

        

        

          1664
          
						      64*1024, 128*1024);

          1664
          
						      64*1024, 128*1024);

        

        

          1665
          
        } else {

          1665
          
        } else {

        



(-)linux-2.6.5-rc1/sound/parisc/harmony.c
      (-1 / +1 lines)




  

    
      
            Lines 847-853
          
      
      
        Link Here
      
    
  

        

          847
          
	harmony->pcm = pcm;

          847
          
	harmony->pcm = pcm;

        

        

          848
          
	

          848
          
	

        

        

          849
          
	/* initialize graveyard buffer */

          849
          
	/* initialize graveyard buffer */

        

          
            

              850
              
	harmony->dma_dev.type = SNDRV_DMA_TYPE_PCI;


              850
              
	harmony->dma_dev.type = SNDRV_DMA_TYPE_DEV;

            

        

          851
          
	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev); 

          851
          
	harmony->dma_dev.dev = snd_dma_pci_data(harmony->fake_pci_dev); 

        

        

          852
          
	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,

          852
          
	harmony->graveyard_addr = snd_dma_alloc_pages(&chip->dma_dev,

        

        

          853
          
			HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);

          853
          
			HARMONY_BUF_SIZE*GRAVEYARD_BUFS, &harmony->graveyard_dma);

        



(-)linux-2.6.5-rc1/sound/sparc/cs4231.c
      (-2 / +2 lines)




  

    
      
            Lines 1570-1577
          
      
      
        Link Here
      
    
  

        

          1570
          

          1570
          

        

        

          1571
          
#ifdef EBUS_SUPPORT

          1571
          
#ifdef EBUS_SUPPORT

        

        

          1572
          
	if (chip->flags & CS4231_FLAG_EBUS) {

          1572
          
	if (chip->flags & CS4231_FLAG_EBUS) {

        

          
            

              1573
              
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_PCI,


              1573
              
		snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV,

            

            

              1574
              
						      snd_dma_pci_data(chip->dev_u.pdev)


              1574
              
						      snd_dma_pci_data(chip->dev_u.pdev),

            

        

          1575
          
						      64*1024, 128*1024);

          1575
          
						      64*1024, 128*1024);

        

        

          1576
          
	} else {

          1576
          
	} else {

        

        

          1577
          
#endif

          1577
          
#endif

        






  

  Return to bug 47236