Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-ux500 / modem-irq-db5500.c

diff --git a/arch/arm/mach-ux500/modem_irq.c b/arch/arm/mach-ux500/modem-irq-db5500.c
similarity index 98%
rename from arch/arm/mach-ux500/modem_irq.c
rename to arch/arm/mach-ux500/modem-irq-db5500.c
index 3187f88711691b546cf7fc65877e8bac13770592..e1296a7447c8493eabccf5ce189b4a0aaf1a6ed6 100644 (file)
--- a/arch/arm/mach-ux500/modem_irq.c
+++ b/arch/arm/mach-ux500/modem-irq-db5500.c
@@ -12,6 +12,8 @@
 #include <linux/io.h>
 #include <linux/slab.h>
 
+#include <mach/id.h>
+
 #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);