Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 1640
b: refs/heads/master
c: 567b565
h: refs/heads/master
v: v3
  • Loading branch information
Paolo 'Blaisorblade' Giarrusso authored and Linus Torvalds committed May 28, 2005
1 parent ab6b62d commit 7ba2b4e
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 34a1a63e37ee8d60bdb842476d9337cdff5413d9
refs/heads/master: 567b56508f7367e161d6d861ef214a900ab45ce9
16 changes: 11 additions & 5 deletions trunk/arch/um/drivers/random.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
/* Much of this ripped from hw_random.c */

/* Copyright (C) 2005 Jeff Dike <jdike@addtoit.com> */
/* Much of this ripped from drivers/char/hw_random.c, see there for other
* copyright.
*
* This software may be used and distributed according to the terms
* of the GNU General Public License, incorporated herein by reference.
*/
#include <linux/module.h>
#include <linux/fs.h>
#include <linux/miscdevice.h>
Expand All @@ -12,8 +17,6 @@
*/
#define RNG_VERSION "1.0.0"
#define RNG_MODULE_NAME "random"
#define RNG_DRIVER_NAME RNG_MODULE_NAME " virtual driver " RNG_VERSION
#define PFX RNG_MODULE_NAME ": "

#define RNG_MISCDEV_MINOR 183 /* official */

Expand Down Expand Up @@ -98,7 +101,7 @@ static int __init rng_init (void)

err = misc_register (&rng_miscdev);
if (err) {
printk (KERN_ERR PFX "misc device register failed\n");
printk (KERN_ERR RNG_MODULE_NAME ": misc device register failed\n");
goto err_out_cleanup_hw;
}

Expand All @@ -120,3 +123,6 @@ static void __exit rng_cleanup (void)

module_init (rng_init);
module_exit (rng_cleanup);

MODULE_DESCRIPTION("UML Host Random Number Generator (RNG) driver");
MODULE_LICENSE("GPL");

0 comments on commit 7ba2b4e

Please sign in to comment.