Merge master.kernel.org:/home/rmk/linux-2.6-arm

menu "Power management options"

config PM

	bool "Power Management support"

	---help---

	  "Power Management" means that parts of your computer are shut

	  off or put into a power conserving "sleep" mode if they are not

	  being used.  There are two competing standards for doing this: APM

	  and ACPI.  If you want to use either one, say Y here and then also

	  to the requisite support below.

	  Power Management is most important for battery powered laptop

	  computers; if you have a laptop, check out the Linux Laptop home

	  page on the WWW at <http://www.linux-on-laptops.com/> or

	  Tuxmobil - Linux on Mobile Computers at <http://www.tuxmobil.org/>

	  and the Battery Powered Linux mini-HOWTO, available from

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

source "kernel/power/Kconfig"

config APM

	tristate "Advanced Power Management Emulation"

	depends on PM

	depends on PM_LEGACY

	---help---

	  APM is a BIOS specification for saving power using several different

	  techniques. This is mostly useful for battery powered laptops with

	bus_unregister(&sa1111_bus_type);

}

module_init(sa1111_init);

subsys_initcall(sa1111_init);

module_exit(sa1111_exit);

MODULE_DESCRIPTION("Intel Corporation SA1111 core driver");