diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-12-01 12:02:17 -0500 |
| commit | 3af4182cc5be7d5505f9801ee3297373f1872446 (patch) | |
| tree | 214348d40ed547a72f9612a7e5c94a01afded812 /drivers/sbus/char/jsflash.c | |
| parent | f5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9 (diff) | |
| parent | c07f62e5f18123103459ff74e86af1518a5b8af5 (diff) | |
Merge branch 'upstream' into topic/asoc
Diffstat (limited to 'drivers/sbus/char/jsflash.c')
| -rw-r--r-- | drivers/sbus/char/jsflash.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/sbus/char/jsflash.c b/drivers/sbus/char/jsflash.c index 2bec9ccc0293..a9a9893a5f95 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c | |||
| @@ -36,7 +36,6 @@ | |||
| 36 | #include <linux/poll.h> | 36 | #include <linux/poll.h> |
| 37 | #include <linux/init.h> | 37 | #include <linux/init.h> |
| 38 | #include <linux/string.h> | 38 | #include <linux/string.h> |
| 39 | #include <linux/smp_lock.h> | ||
| 40 | #include <linux/genhd.h> | 39 | #include <linux/genhd.h> |
| 41 | #include <linux/blkdev.h> | 40 | #include <linux/blkdev.h> |
| 42 | 41 | ||