diff --git a/[refs] b/[refs] index 8520279589d6..1c02daa71c2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9148cc502752b12051760e6c5ba5daaea3367360 +refs/heads/master: 0f71e8b98506252db22a0c4fcfecb0aadcf393cc diff --git a/trunk/sound/soc/at91/at91rm9200-i2s.c b/trunk/sound/soc/at91/at91rm9200-i2s.c index a74c5d85589b..044a774b4301 100644 --- a/trunk/sound/soc/at91/at91rm9200-i2s.c +++ b/trunk/sound/soc/at91/at91rm9200-i2s.c @@ -270,8 +270,7 @@ static struct at91rm9200_ssc_info { }; -static int at91rm9200_i2s_interrupt(int irq, void *dev_id, - struct pt_regs *regs) +static irqreturn_t at91rm9200_i2s_interrupt(int irq, void *dev_id) { struct at91rm9200_ssc_info *ssc_p = dev_id; at91rm9200_pcm_dma_params_t *dma_params;