From: Martin Fouts <Martin.Fouts@palmsource.com>
Date: Mon, 1 Aug 2005 12:48:36 +0000 (-0700)
Subject: [PATCH] ARM: OMAP: problem on compiling omap730 with kernel 2.6 from git
X-Git-Tag: v2.6.13-omap1~32
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=040471839fea41cd9eefb5db6ae7ced0ac8bc404;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP: problem on compiling omap730 with kernel 2.6 from git

This is a configuration bug in arch/arm/mach-omap/omap1/serial.c.  There
are two lines that need to be protected by #ifdef CONFIG_PM.
---

diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 1eff0e1c367..107c68c8ab5 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -24,6 +24,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/tc.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/fpga.h>
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 59ec5e15711..2bef59aee51 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -26,7 +26,9 @@
 #include <asm/arch/mux.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/fpga.h>
+#ifdef CONFIG_PM
 #include <asm/arch/pm.h>
+#endif
 
 static struct clk * uart1_ck = NULL;
 static struct clk * uart2_ck = NULL;
@@ -274,7 +276,9 @@ static void __init omap_serial_wakeup_init(void)
 
 static int __init omap_init(void)
 {
+#ifdef CONFIG_PM
 	omap_serial_wakeup_init();
+#endif
 	return platform_device_register(&serial_device);
 }
 arch_initcall(omap_init);