diff --git a/[refs] b/[refs] index fb2721414de6..9aca008a4a93 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0357ae8f8cf460226e6b4167ce4350452ea68943 +refs/heads/master: 7509acdfd128943d0eced51a4b19b8a3cb1b5d26 diff --git a/trunk/arch/arm/mach-sa1100/include/mach/irqs.h b/trunk/arch/arm/mach-sa1100/include/mach/irqs.h index 8c8845b5ae5b..d18f21abef80 100644 --- a/trunk/arch/arm/mach-sa1100/include/mach/irqs.h +++ b/trunk/arch/arm/mach-sa1100/include/mach/irqs.h @@ -77,7 +77,7 @@ */ #ifdef CONFIG_SA1111 #define NR_IRQS (IRQ_BOARD_END + 55) -#elif defined(CONFIG_SHARPSL_LOCOMO) +#elif defined(CONFIG_SHARP_LOCOMO) #define NR_IRQS (IRQ_BOARD_START + 4) #else #define NR_IRQS (IRQ_BOARD_START)