diff --git a/[refs] b/[refs] index 6868d90cde4d..589989e2d5d5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 269647dc8f3b557d0f9ec59533a5e651cc109efb +refs/heads/master: 714e76d71d99f00734217e642ba64204df3bdf35 diff --git a/trunk/arch/blackfin/include/asm/bfin_sport.h b/trunk/arch/blackfin/include/asm/bfin_sport.h index d4169590e757..b558908e1c79 100644 --- a/trunk/arch/blackfin/include/asm/bfin_sport.h +++ b/trunk/arch/blackfin/include/asm/bfin_sport.h @@ -126,7 +126,7 @@ struct sport_dev { int tx_len; int tx_sent; - int sport_err_irq; + int err_irq; struct mutex mutex; /* mutual exclusion semaphore */ struct task_struct *task;