From 7c56f551d4129e41ab4fcc0c594fef46623b1b15 Mon Sep 17 00:00:00 2001 From: Barry Song Date: Tue, 7 Jul 2009 07:41:50 +0000 Subject: [PATCH] --- yaml --- r: 155586 b: refs/heads/master c: 4c94c3e09adba9718218d6e3d35b2dfae81f3911 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/blackfin/mach-bf537/boards/stamp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3a6eff9f50ff..a7ec08de908d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ad863a9dc9887330b2ab753323063865c59d8db6 +refs/heads/master: 4c94c3e09adba9718218d6e3d35b2dfae81f3911 diff --git a/trunk/arch/blackfin/mach-bf537/boards/stamp.c b/trunk/arch/blackfin/mach-bf537/boards/stamp.c index ab92e42f8919..bd656907b8c0 100644 --- a/trunk/arch/blackfin/mach-bf537/boards/stamp.c +++ b/trunk/arch/blackfin/mach-bf537/boards/stamp.c @@ -1313,7 +1313,7 @@ static struct i2c_board_info __initdata bfin_i2c_board_info[] = { #if defined(CONFIG_JOYSTICK_AD7142) || defined(CONFIG_JOYSTICK_AD7142_MODULE) { I2C_BOARD_INFO("ad7142_joystick", 0x2C), - .irq = IRQ_PF5, + .irq = IRQ_PG5, }, #endif #if defined(CONFIG_BFIN_TWI_LCD) || defined(CONFIG_BFIN_TWI_LCD_MODULE)