[alsa-devel] [PATCH] ASoC: Fix mismerge of Speyside set_bias_level_post()
            
            
            
                8 Jun
                
                    2011
                
            
            
                8 Jun
                
                '11
                
            
            
            
        
    
                5:12 p.m.
            
        Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com --- sound/soc/samsung/speyside.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/sound/soc/samsung/speyside.c b/sound/soc/samsung/speyside.c index 2515dba..d6dee4d 100644 --- a/sound/soc/samsung/speyside.c +++ b/sound/soc/samsung/speyside.c @@ -301,6 +301,7 @@ static struct snd_soc_card speyside = { .num_configs = ARRAY_SIZE(speyside_codec_conf),
.set_bias_level = speyside_set_bias_level, + .set_bias_level_post = speyside_set_bias_level_post,
.controls = controls, .num_controls = ARRAY_SIZE(controls),
-- 
1.7.5.3
    
            
            
            
                8 Jun
                
            
            
                8 Jun
                
            
            
            
        
    
                6:26 p.m.
            
        On 08/06/11 16:12, Mark Brown wrote:
Signed-off-by: Mark Brown broonie@opensource.wolfsonmicro.com
sound/soc/samsung/speyside.c | 1 +
Acked-by: Liam Girdwood lrg@ti.com
        5263
        
      
          Age (days ago)
        
      
        5263
        
    
          Last active (days ago)
        
        
        
        1 comments
    
    
        
        2 participants
    
    
    
    
    
    
    
    
    participants (2)
- 
                
Liam Girdwood - 
                
Mark Brown