diff options
author | Takashi Iwai <tiwai@suse.de> | 2010-11-29 07:44:01 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2010-11-29 07:44:01 +0100 |
commit | ca19e77e44985b5500f5461f7d2f4ce799cb60ce (patch) | |
tree | 3ba3635ac2f212b332198b14cc3239195c153e67 /fs/ncpfs/dir.c | |
parent | 9d57883f08d3c0c111b50bf185dfee9731a12c76 (diff) | |
parent | ac70eb1305d5a81efd1e32327d7e79be15a63a5a (diff) | |
download | linux-ca19e77e44985b5500f5461f7d2f4ce799cb60ce.tar.gz |
Merge branch 'fix/hda' into topic/hda
Diffstat (limited to 'fs/ncpfs/dir.c')
-rw-r--r-- | fs/ncpfs/dir.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/fs/ncpfs/dir.c b/fs/ncpfs/dir.c index aac8832e919e..f22b12e7d337 100644 --- a/fs/ncpfs/dir.c +++ b/fs/ncpfs/dir.c @@ -19,7 +19,6 @@ #include <linux/mm.h> #include <asm/uaccess.h> #include <asm/byteorder.h> -#include <linux/smp_lock.h> #include <linux/ncp_fs.h> |