diff options
author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2007-07-16 02:40:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-16 12:05:46 -0400 |
commit | f3dc8c189a20dc5d115b8f0d07ac620e69eff05c (patch) | |
tree | b4e3c56b51b362eef45e049a74689339afe965b8 /drivers/char/hw_random/intel-rng.c | |
parent | b4c07bce796833401317519e44075889c5fd4d5f (diff) |
intel-rng: undo mess made by an 80 column extremist
The intel-rng printed a nice well formatted message when the port was
disabled. Someone then came along and blindly trashed it by screwing up a
trim down to 80 columns.
Put it back into the right format and keep the overlong lines as the result
is also MUCH easier to read in this specific case.
Signed-off-by: Alan Cox <alan@redhat.com>
Cc: Michael Buesch <mb@bu3sch.de>
Acked-by: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/char/hw_random/intel-rng.c')
-rw-r--r-- | drivers/char/hw_random/intel-rng.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/char/hw_random/intel-rng.c b/drivers/char/hw_random/intel-rng.c index 4ae9811d1a6c..753f46052b87 100644 --- a/drivers/char/hw_random/intel-rng.c +++ b/drivers/char/hw_random/intel-rng.c | |||
@@ -296,12 +296,10 @@ static int __init intel_init_hw_struct(struct intel_rng_hw *intel_rng_hw, | |||
296 | (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK)) | 296 | (BIOS_CNTL_LOCK_ENABLE_MASK|BIOS_CNTL_WRITE_ENABLE_MASK)) |
297 | == BIOS_CNTL_LOCK_ENABLE_MASK) { | 297 | == BIOS_CNTL_LOCK_ENABLE_MASK) { |
298 | static __initdata /*const*/ char warning[] = | 298 | static __initdata /*const*/ char warning[] = |
299 | KERN_WARNING PFX "Firmware space is locked read-only. " | 299 | KERN_WARNING PFX "Firmware space is locked read-only. If you can't or\n" |
300 | KERN_WARNING PFX "If you can't or\n don't want to " | 300 | KERN_WARNING PFX "don't want to disable this in firmware setup, and if\n" |
301 | KERN_WARNING PFX "disable this in firmware setup, and " | 301 | KERN_WARNING PFX "you are certain that your system has a functional\n" |
302 | KERN_WARNING PFX "if\n you are certain that your " | 302 | KERN_WARNING PFX "RNG, try using the 'no_fwh_detect' option.\n"; |
303 | KERN_WARNING PFX "system has a functional\n RNG, try" | ||
304 | KERN_WARNING PFX "using the 'no_fwh_detect' option.\n"; | ||
305 | 303 | ||
306 | if (no_fwh_detect) | 304 | if (no_fwh_detect) |
307 | return -ENODEV; | 305 | return -ENODEV; |