diff --git a/[refs] b/[refs] index acdf004040c1..ba69f118c417 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: abf12d719a2c9e45f7f90c02a3a25107206ed57a +refs/heads/master: 5ec65521c99178a87f4c859101a92c36f4701fd7 diff --git a/trunk/arch/arm/mach-ux500/modem-irq-db5500.c b/trunk/arch/arm/mach-ux500/modem-irq-db5500.c index 3187f8871169..e1296a7447c8 100644 --- a/trunk/arch/arm/mach-ux500/modem-irq-db5500.c +++ b/trunk/arch/arm/mach-ux500/modem-irq-db5500.c @@ -12,6 +12,8 @@ #include #include +#include + #define MODEM_INTCON_BASE_ADDR 0xBFFD3000 #define MODEM_INTCON_SIZE 0xFFF @@ -101,6 +103,9 @@ static int modem_irq_init(void) static struct irq_chip modem_irq_chip; struct modem_irq *mi; + if (!cpu_is_u5500()) + return -ENODEV; + pr_info("modem_irq: Set up IRQ handler for incoming modem IRQ %d\n", IRQ_DB5500_MODEM);