headers
Linus Torvalds | 24 Jul 2012 06:54
Gravatar

Re: [GIT PULL] Blackfin changes for 3.6-rc1

On Mon, Jul 23, 2012 at 8:54 PM, Bob Liu <lliubbo@...> wrote:
>
> Please pull blackfin changes for 3.6-rc1.

No.

These were clearly rebased today. And on top of random state in the
merge window.

Why would you do that? It's so horribly wrong that there's no way in
hell I'm pulling this mess.

              Linus
Permalink | Reply | 1 comment |
headers
Bob Liu | 30 Jul 2012 08:44
Picon

[PATCH] drivers: net: irda: bfin_sir: fix compile error

From: Sonic Zhang <sonic.zhang@...>

Bit IREN is replaced by UMOD_IRDA and UMOD_MASK since blackfin 60x added, but
this driver didn't update which will cause bfin_sir build error:

drivers/net/irda/bfin_sir.c:161:9: error: 'IREN' undeclared (first use in this
function)
drivers/net/irda/bfin_sir.c:435:18: error: 'IREN' undeclared (first use in
this function)
drivers/net/irda/bfin_sir.c:521:11: error: 'IREN' undeclared (first use in
this function)

This patch fix it.

Signed-off-by: Sonic Zhang <sonic.zhang@...>
Signed-off-by: Bob Liu <lliubbo@...>
---
 drivers/net/irda/bfin_sir.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/irda/bfin_sir.c b/drivers/net/irda/bfin_sir.c
index a561ae4..c6a0299 100644
--- a/drivers/net/irda/bfin_sir.c
+++ b/drivers/net/irda/bfin_sir.c
 <at>  <at>  -158,7 +158,7  <at>  <at>  static int bfin_sir_set_speed(struct bfin_sir_port *port, int speed)
 	/* If not add the 'RPOLC', we can't catch the receive interrupt.
 	 * It's related with the HW layout and the IR transiver.
 	 */
-	val |= IREN | RPOLC;
+	val |= UMOD_IRDA | RPOLC;
(Continue reading)

Permalink | Reply | 4 comments |

Gmane