diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 11:56:43 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-17 11:56:43 -0400 |
| commit | 43f82216f0bd114599f4a221ae6924f3658a0c9a (patch) | |
| tree | 89dbd85a0a1882ae38e6b61e360b365c018195fd /drivers/char | |
| parent | 20f85957667ccc53183b5ffac22213d75e317408 (diff) | |
| parent | b435fdcda126db42343b8055d04a0a27c229717b (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
* git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
Input: fm801-gp - handle errors from pci_enable_device()
Input: gameport core - handle errors returned by device_bind_driver()
Input: serio core - handle errors returned by device_bind_driver()
Lockdep: fix compile error in drivers/input/serio/serio.c
Input: serio - add lockdep annotations
Lockdep: add lockdep_set_class_and_subclass() and lockdep_set_subclass()
Input: atkbd - supress "too many keys" error message
Input: i8042 - supress ACK/NAKs when blinking during panic
Input: add missing exports to fix modular build
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/random.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/char/random.c b/drivers/char/random.c index 07f47a0208a7..eb6b13f4211a 100644 --- a/drivers/char/random.c +++ b/drivers/char/random.c | |||
| @@ -645,6 +645,7 @@ void add_input_randomness(unsigned int type, unsigned int code, | |||
| 645 | add_timer_randomness(&input_timer_state, | 645 | add_timer_randomness(&input_timer_state, |
| 646 | (type << 4) ^ code ^ (code >> 4) ^ value); | 646 | (type << 4) ^ code ^ (code >> 4) ^ value); |
| 647 | } | 647 | } |
| 648 | EXPORT_SYMBOL_GPL(add_input_randomness); | ||
| 648 | 649 | ||
| 649 | void add_interrupt_randomness(int irq) | 650 | void add_interrupt_randomness(int irq) |
| 650 | { | 651 | { |