From 139b380a7858b85a9d60e82dd6e07e299f0753c3 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 10 Dec 2007 13:33:06 +0000 Subject: [PATCH] --- yaml --- r: 77549 b: refs/heads/master c: 16f159b1fc4f227a25cc4792e3804353e4777ebe h: refs/heads/master i: 77547: 3a0376a9392275e4203d4b31d9691e224fb30019 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/lubbock.c | 10 +++++++--- trunk/arch/arm/mach-pxa/mainstone.c | 10 +++++++--- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index bb32eb68c445..6ded1fb826de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f1a74e5a2de0459139b85af95e901448726c375 +refs/heads/master: 16f159b1fc4f227a25cc4792e3804353e4777ebe diff --git a/trunk/arch/arm/mach-pxa/lubbock.c b/trunk/arch/arm/mach-pxa/lubbock.c index ebb73f133486..1b9290c0ed5e 100644 --- a/trunk/arch/arm/mach-pxa/lubbock.c +++ b/trunk/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/trunk/arch/arm/mach-pxa/mainstone.c b/trunk/arch/arm/mach-pxa/mainstone.c index a5db00c38f1f..237459bf67c6 100644 --- a/trunk/arch/arm/mach-pxa/mainstone.c +++ b/trunk/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; }