[PATCH] 1036/1: allow APM to be build as module (for 2.5.5) (modified)

This is updated version of patch 1002/1 . As build system in 2.5.5 kernel allows same name of .c files in different directories when computing dependencies and versioning information, the patch becomes simple. Now it just modify appropriate Makefile (in arch/arm/mach-sa1100) and exports one symbol in arch/arm/mach-sa10/pm.c)

This patch replace 1002/1.

(Hope, this is what you want Russel :)

diff --git a/arch/arm/mach-sa1100/Makefile b/arch/arm/mach-sa1100/Makefile
index 0d5bd07792f1196b11f5c940785f29fb965bed57..66e786486cca15d488545103d61f4289e42e8c85 100644 (file)
--- a/arch/arm/mach-sa1100/Makefile
+++ b/arch/arm/mach-sa1100/Makefile
@@ -17,7 +17,7 @@ obj-  :=
 led-y := leds.o
 
 export-objs := dma.o generic.o irq.o pcipool.o sa1111.o sa1111-pcibuf.o \
-               usb_ctl.o usb_recv.o usb_send.o
+               usb_ctl.o usb_recv.o usb_send.o pm.o
 
 # This needs to be cleaned up.  We probably need to have SA1100
 # and SA1110 config symbols.

diff --git a/arch/arm/mach-sa1100/pm.c b/arch/arm/mach-sa1100/pm.c
index 649e73f3ab1c34588f3c5fdd392b054ce1416fea..3c6a969f37b13bfa25872d5a8a1311f225d40f3e 100644 (file)
--- a/arch/arm/mach-sa1100/pm.c
+++ b/arch/arm/mach-sa1100/pm.c
@@ -20,6 +20,7 @@
  *                     in the platform specific files.
  */
 #include <linux/config.h>
+#include <linux/module.h>
 #include <linux/init.h>
 #include <linux/pm.h>
 #include <linux/slab.h>
@@ -27,6 +28,7 @@
 #include <linux/interrupt.h>
 #include <linux/sysctl.h>
 #include <linux/errno.h>
+#include <linux/cpufreq.h>
 
 #include <asm/hardware.h>
 #include <asm/memory.h>
@@ -210,3 +212,5 @@ static int __init pm_init(void)
 __initcall(pm_init);
 
 #endif
+
+EXPORT_SYMBOL(pm_do_suspend);