aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Baryshkov <dbaryshkov@gmail.com>2008-05-31 16:17:32 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-06-02 19:33:34 +0100
commit5806d8abf6b152f23d057c2e6b9199892883a8df (patch)
treeace5ce41cbc910d6fc088e63548b82b3b4fd64b2
parent043fbc099af0fc0ec94112c7235b7544147149f4 (diff)
downloadkernel_samsung_aries-5806d8abf6b152f23d057c2e6b9199892883a8df.zip
kernel_samsung_aries-5806d8abf6b152f23d057c2e6b9199892883a8df.tar.gz
kernel_samsung_aries-5806d8abf6b152f23d057c2e6b9199892883a8df.tar.bz2
[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>
-rw-r--r--arch/arm/mach-pxa/spitz_pm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-pxa/spitz_pm.c b/arch/arm/mach-pxa/spitz_pm.c
index 48396f4..3603540 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;