From: Dmitry Baryshkov <dbaryshkov@gmail.com>
Date: Sat, 31 May 2008 15:17:32 +0000 (+0100)
Subject: [ARM] 5073/1: spitz_pm: don't register devices on non-spitz machines
X-Git-Tag: v2.6.27-rc1~1095^2^2~7^3~3
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5806d8abf6b152f23d057c2e6b9199892883a8df;p=linux-2.6-omap-h63xx.git

[ARM] 5073/1: spitz_pm: don't register devices on non-spitz machines

Signed-off-by: Dmitry Baryshkov <dbaryshkov@gmail.com>
Acked-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 48396f4eb26..360354084ae 100644
--- a/arch/arm/mach-pxa/spitz_pm.c
+++ b/arch/arm/mach-pxa/spitz_pm.c
@@ -26,6 +26,7 @@
 #include <asm/arch/sharpsl.h>
 #include <asm/arch/spitz.h>
 #include <asm/arch/pxa-regs.h>
+#include <asm/arch/pxa2xx-regs.h>
 #include <asm/arch/pxa2xx-gpio.h>
 #include "sharpsl.h"
 
@@ -231,6 +232,10 @@ static int __devinit spitzpm_init(void)
 {
 	int ret;
 
+	if (!machine_is_spitz() && !machine_is_akita()
+			&& !machine_is_borzoi())
+		return -ENODEV;
+
 	spitzpm_device = platform_device_alloc("sharpsl-pm", -1);
 	if (!spitzpm_device)
 		return -ENOMEM;