diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 17:04:25 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-19 17:04:25 +0900 |
| commit | fe040be2fdc49a4132c5f64359c629aeeb8e4947 (patch) | |
| tree | 40323a8f05d3754372f561bb8f4698ef1a4e9c8f /fs/ncpfs/file.c | |
| parent | 2006920a18cc9f499e5cccf9e6f1aa9f6120705e (diff) | |
| parent | 6722a4016d7f5f107a82ad71a3ee1ccec105532f (diff) | |
| download | talos-obmc-linux-fe040be2fdc49a4132c5f64359c629aeeb8e4947.tar.gz talos-obmc-linux-fe040be2fdc49a4132c5f64359c629aeeb8e4947.zip | |
Merge branch 'common/fbdev-mipi' of master.kernel.org:/pub/scm/linux/kernel/git/lethal/sh-2.6
Diffstat (limited to 'fs/ncpfs/file.c')
| -rw-r--r-- | fs/ncpfs/file.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ncpfs/file.c b/fs/ncpfs/file.c index 6c754f70c529..cb50aaf981df 100644 --- a/fs/ncpfs/file.c +++ b/fs/ncpfs/file.c @@ -17,7 +17,6 @@ #include <linux/mm.h> #include <linux/vmalloc.h> #include <linux/sched.h> -#include <linux/smp_lock.h> #include <linux/ncp_fs.h> #include "ncplib_kernel.h" |
