Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2fd592e4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm 

* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-apm:
  [APM] SH: Convert to use shared APM emulation.
  [APM] MIPS: Convert to use shared APM emulation.
  [APM] ARM: Convert to use shared APM emulation.
  [APM] Add shared version of APM emulation
parents 2affc857 0a9b0db1

arch/arm/Kconfig

+4 −25
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config ARM 
	bool

	default y

	select RTC_LIB

	select SYS_SUPPORTS_APM_EMULATION

	help

	  The ARM series is a line of low-power-consumption RISC chip designs

	  licensed by ARM Ltd and targeted at embedded applications and
@@ -17,6 +18,9 @@ config ARM 
	  Europe.  There is an ARM Linux project with a web page at

	  <http://www.arm.linux.org.uk/>.



config SYS_SUPPORTS_APM_EMULATION

	bool



config GENERIC_TIME

	bool

	default n
@@ -856,31 +860,6 @@ menu "Power management options" 


source "kernel/power/Kconfig"



config APM

	tristate "Advanced Power Management Emulation"

	---help---

	  APM is a BIOS specification for saving power using several different

	  techniques. This is mostly useful for battery powered laptops with

	  APM compliant BIOSes. If you say Y here, the system time will be

	  reset after a RESUME operation, the /proc/apm device will provide

	  battery status information, and user-space programs will receive

	  notification of APM "events" (e.g. battery status change).



	  In order to use APM, you will need supporting software. For location

	  and more information, read <file:Documentation/pm.txt> and the

	  Battery Powered Linux mini-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  This driver does not spin down disk drives (see the hdparm(8)

	  manpage ("man 8 hdparm") for that), and it doesn't turn off

	  VESA-compliant "green" monitors.



	  Generally, if you don't have a battery in your machine, there isn't

	  much point in using this driver and you should say N. If you get

	  random kernel OOPSes or reboots that don't seem to be related to

	  anything, try disabling/enabling this option (or disabling/enabling

	  APM in your BIOS).



endmenu



source "net/Kconfig"

arch/arm/common/sharpsl_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>

#include <asm/apm.h>

#include <asm/apm-emulation.h>

#include <asm/arch/pm.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/sharpsl.h>

arch/arm/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-y := compat.o entry-armv.o entry-common.o irq.o \ 
		   process.o ptrace.o semaphore.o setup.o signal.o sys_arm.o \

		   time.o traps.o



obj-$(CONFIG_APM)		+= apm.o

obj-$(CONFIG_ISA_DMA_API)	+= dma.o

obj-$(CONFIG_ARCH_ACORN)	+= ecard.o 

obj-$(CONFIG_FIQ)		+= fiq.o

arch/arm/mach-pxa/corgi_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include <linux/delay.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <asm/apm.h>

#include <asm/apm-emulation.h>

#include <asm/irq.h>

#include <asm/mach-types.h>

#include <asm/hardware.h>

arch/arm/mach-pxa/sharpsl_pm.c

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ 


#include <asm/hardware.h>

#include <asm/mach-types.h>

#include <asm/apm.h>

#include <asm/apm-emulation.h>

#include <asm/arch/pm.h>

#include <asm/arch/pxa-regs.h>

#include <asm/arch/sharpsl.h>