2 files changed, 14 insertions, 6 deletions

diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index ebb73f133486..1b9290c0ed5e 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -136,9 +136,13 @@ static struct sys_device lubbock_irq_device = {
 
 static int __init lubbock_irq_device_init(void)
 {
-        int ret = sysdev_class_register(&lubbock_irq_sysclass);
-        if (ret == 0)
-                ret = sysdev_register(&lubbock_irq_device);
+        int ret = -ENODEV;
+
+        if (machine_is_lubbock()) {
+                ret = sysdev_class_register(&lubbock_irq_sysclass);
+                if (ret == 0)
+                        ret = sysdev_register(&lubbock_irq_device);
+        }
         return ret;
 }
 
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index a5db00c38f1f..237459bf67c6 100644
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -131,9 +131,13 @@ static struct sys_device mainstone_irq_device = {
 
 static int __init mainstone_irq_device_init(void)
 {
-        int ret = sysdev_class_register(&mainstone_irq_sysclass);
-        if (ret == 0)
-                ret = sysdev_register(&mainstone_irq_device);
+        int ret = -ENODEV;
+
+        if (machine_is_mainstone()) {
+                ret = sysdev_class_register(&mainstone_irq_sysclass);
+                if (ret == 0)
+                        ret = sysdev_register(&mainstone_irq_device);
+        }
         return ret;
 }