diff options
author | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 12:34:25 +0100 |
---|---|---|
committer | David Woodhouse <dwmw2@infradead.org> | 2008-04-22 12:34:25 +0100 |
commit | f838bad1b3be8ca0c785ee0e0c570dfda74cf377 (patch) | |
tree | 5a842a8056a708cfad55a20fa8ab733dd94b0903 /drivers/block/cryptoloop.c | |
parent | dd919660aacdf4adfcd279556aa03e595f7f0fc2 (diff) | |
parent | 807501475fce0ebe68baedf87f202c3e4ee0d12c (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/block/cryptoloop.c')
-rw-r--r-- | drivers/block/cryptoloop.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c index 241167878ed..8b6bb764b0a 100644 --- a/drivers/block/cryptoloop.c +++ b/drivers/block/cryptoloop.c @@ -27,7 +27,6 @@ #include <linux/blkdev.h> #include <linux/loop.h> #include <linux/scatterlist.h> -#include <asm/semaphore.h> #include <asm/uaccess.h> MODULE_LICENSE("GPL"); |