diff options
| author | Greg Kroah-Hartman | 2010-11-29 19:44:22 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2010-11-29 19:44:22 +0100 |
| commit | 8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf (patch) | |
| tree | d4933996296141103b1f54e563268b23c95d6dd4 /drivers/staging/speakup | |
| parent | staging: fix winbond build, needs delay.h (diff) | |
| parent | Un-inline get_pipe_info() helper function (diff) | |
| download | kernel-qcow2-linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.gz kernel-qcow2-linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.tar.xz kernel-qcow2-linux-8d7ee9c498e29026aa2a99db40c0032bfe2d4fdf.zip | |
Merge branch 'master' into work
Diffstat (limited to 'drivers/staging/speakup')
| -rw-r--r-- | drivers/staging/speakup/buffers.c | 1 |
1 files changed, 0 insertions, 1 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> |