diff --git a/[refs] b/[refs] index 5a0e340036be..9ff8c0334f8d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3534cccd26afdfd3ce0915a4942afca185f2a39b +refs/heads/master: e60f137b715b0a19b84502c23a09c5af9107399d diff --git a/trunk/arch/arm/mach-pxa/include/mach/balloon3.h b/trunk/arch/arm/mach-pxa/include/mach/balloon3.h index 561562b4360b..3506da1f27bb 100644 --- a/trunk/arch/arm/mach-pxa/include/mach/balloon3.h +++ b/trunk/arch/arm/mach-pxa/include/mach/balloon3.h @@ -174,7 +174,7 @@ enum balloon3_features { #define BALLOON3_CODEC_IRQ IRQ_GPIO(BALLOON3_GPIO_CODEC_IRQ) #define BALLOON3_S0_CD_IRQ IRQ_GPIO(BALLOON3_GPIO_S0_CD) -#define BALLOON3_NR_IRQS (IRQ_BOARD_START + 4) +#define BALLOON3_NR_IRQS (IRQ_BOARD_START + 16) extern int balloon3_has(enum balloon3_features feature);