diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 10:47:56 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-12-07 10:47:56 -0800 |
| commit | ea3398a1ae54cd3403f3cc0f6aa498c7452c681a (patch) | |
| tree | 19903cfd3eb11f6cdd84f3b6923e604028178150 /drivers/staging/speakup | |
| parent | 03fa6fc5a68242ddd7cc3ba4255fe6f65b21ce41 (diff) | |
| parent | cf7d7e5a1980d1116ee152d25dac382b112b9c17 (diff) | |
Staging: Merge 2.6.37-rc5 into staging-next
This was done to handle a number of conflicts in the batman-adv
and winbond drivers properly. It also now allows us to fix up the sysfs
attributes properly that were not in the .37 release due to them being
only in this tree at the time.
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/speakup')
| -rw-r--r-- | drivers/staging/speakup/buffers.c | 1 | ||||
| -rw-r--r-- | drivers/staging/speakup/fakekey.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/drivers/staging/speakup/buffers.c b/drivers/staging/speakup/buffers.c index b7b60d5e8660..a2db956edd54 100644 --- a/drivers/staging/speakup/buffers.c +++ b/drivers/staging/speakup/buffers.c @@ -1,5 +1,4 @@ #include <linux/console.h> -#include <linux/smp_lock.h> #include <linux/types.h> #include <linux/wait.h> diff --git a/drivers/staging/speakup/fakekey.c b/drivers/staging/speakup/fakekey.c index adb93f21c0d6..65b231178f05 100644 --- a/drivers/staging/speakup/fakekey.c +++ b/drivers/staging/speakup/fakekey.c @@ -62,7 +62,6 @@ void speakup_remove_virtual_keyboard(void) { if (virt_keyboard != NULL) { input_unregister_device(virt_keyboard); - input_free_device(virt_keyboard); virt_keyboard = NULL; } } |