diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-26 08:22:50 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-26 08:22:50 +0100 |
| commit | 7fbb8759eff9a348efa5f352ffaa51c364837c4b (patch) | |
| tree | d40cd3f47b9f667ba94d9613270132080dcb6a1a /drivers/sbus/char/jsflash.c | |
| parent | 6003ab0bad4cc56f3c4fadf62a0d23a967b9c53b (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
Merge commit 'v2.6.28-rc6' into core/debug
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 2bec9ccc029..a9a9893a5f9 100644 --- a/drivers/sbus/char/jsflash.c +++ b/drivers/sbus/char/jsflash.c @@ -36,7 +36,6 @@ #include <linux/poll.h> #include <linux/init.h> #include <linux/string.h> -#include <linux/smp_lock.h> #include <linux/genhd.h> #include <linux/blkdev.h> |