diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
| commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
| tree | baec074db38a5ceaaabbcee76f199acef43bb42a /kernel | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
| parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/power/Kconfig | 2 | ||||
| -rw-r--r-- | kernel/printk.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index 5ec248cb7f4a..9fd8d4f03595 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig | |||
| @@ -38,7 +38,7 @@ config PM_DEBUG | |||
| 38 | 38 | ||
| 39 | config SOFTWARE_SUSPEND | 39 | config SOFTWARE_SUSPEND |
| 40 | bool "Software Suspend" | 40 | bool "Software Suspend" |
| 41 | depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FVR || PPC32) && !SMP) | 41 | depends on PM && SWAP && (X86 && (!SMP || SUSPEND_SMP)) || ((FRV || PPC32) && !SMP) |
| 42 | ---help--- | 42 | ---help--- |
| 43 | Enable the possibility of suspending the machine. | 43 | Enable the possibility of suspending the machine. |
| 44 | It doesn't need APM. | 44 | It doesn't need APM. |
diff --git a/kernel/printk.c b/kernel/printk.c index 2251be80cd22..13ced0f7828f 100644 --- a/kernel/printk.c +++ b/kernel/printk.c | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | * Ted Ts'o, 2/11/93. | 11 | * Ted Ts'o, 2/11/93. |
| 12 | * Modified for sysctl support, 1/8/97, Chris Horn. | 12 | * Modified for sysctl support, 1/8/97, Chris Horn. |
| 13 | * Fixed SMP synchronization, 08/08/99, Manfred Spraul | 13 | * Fixed SMP synchronization, 08/08/99, Manfred Spraul |
| 14 | * manfreds@colorfullife.com | 14 | * manfred@colorfullife.com |
| 15 | * Rewrote bits to get rid of console_lock | 15 | * Rewrote bits to get rid of console_lock |
| 16 | * 01Mar01 Andrew Morton <andrewm@uow.edu.au> | 16 | * 01Mar01 Andrew Morton <andrewm@uow.edu.au> |
| 17 | */ | 17 | */ |