Commit 9b1833b3 authored by Linus Torvalds's avatar Linus Torvalds

Merge bk://kernel.bkbits.net//home/mochel/linux-2.5-power/

into home.osdl.org:/home/torvalds/v2.5/linux
parents d44b2c24 5a16a592
...@@ -90,7 +90,7 @@ extern int pm_prepare_console(void); ...@@ -90,7 +90,7 @@ extern int pm_prepare_console(void);
extern void pm_restore_console(void); extern void pm_restore_console(void);
#else #else
static inline void refrigerator(unsigned long) static inline void refrigerator(unsigned long flag)
{ {
} }
......
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