Commit 47227d50 authored by Linus Torvalds's avatar Linus Torvalds

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

parents 7ae8c5ec 72724382
...@@ -652,25 +652,11 @@ endmenu ...@@ -652,25 +652,11 @@ endmenu
menu "Power management options" menu "Power management options"
config PM source "kernel/power/Kconfig"
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>.
config APM config APM
tristate "Advanced Power Management Emulation" tristate "Advanced Power Management Emulation"
depends on PM depends on PM_LEGACY
---help--- ---help---
APM is a BIOS specification for saving power using several different APM is a BIOS specification for saving power using several different
techniques. This is mostly useful for battery powered laptops with techniques. This is mostly useful for battery powered laptops with
......
...@@ -1266,7 +1266,7 @@ static void __exit sa1111_exit(void) ...@@ -1266,7 +1266,7 @@ static void __exit sa1111_exit(void)
bus_unregister(&sa1111_bus_type); bus_unregister(&sa1111_bus_type);
} }
module_init(sa1111_init); subsys_initcall(sa1111_init);
module_exit(sa1111_exit); module_exit(sa1111_exit);
MODULE_DESCRIPTION("Intel Corporation SA1111 core driver"); MODULE_DESCRIPTION("Intel Corporation SA1111 core driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment