diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-21 18:41:27 -0400 |
| commit | 429f731dea577bdd43693940cdca524135287e6a (patch) | |
| tree | 932337b7d23dd736612c6b6e6601c50bc24cfc5f /drivers/block/cryptoloop.c | |
| parent | 85b375a613085b78531ec86369a51c2f3b922f95 (diff) | |
| parent | d2f5e80862d33a7746a40569840248a592dbc395 (diff) | |
Merge branch 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc
* 'semaphore' of git://git.kernel.org/pub/scm/linux/kernel/git/willy/misc:
Deprecate the asm/semaphore.h files in feature-removal-schedule.
Convert asm/semaphore.h users to linux/semaphore.h
security: Remove unnecessary inclusions of asm/semaphore.h
lib: Remove unnecessary inclusions of asm/semaphore.h
kernel: Remove unnecessary inclusions of asm/semaphore.h
include: Remove unnecessary inclusions of asm/semaphore.h
fs: Remove unnecessary inclusions of asm/semaphore.h
drivers: Remove unnecessary inclusions of asm/semaphore.h
net: Remove unnecessary inclusions of asm/semaphore.h
arch: Remove unnecessary inclusions of asm/semaphore.h
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 241167878edf..8b6bb764b0a3 100644 --- a/drivers/block/cryptoloop.c +++ b/drivers/block/cryptoloop.c | |||
| @@ -27,7 +27,6 @@ | |||
| 27 | #include <linux/blkdev.h> | 27 | #include <linux/blkdev.h> |
| 28 | #include <linux/loop.h> | 28 | #include <linux/loop.h> |
| 29 | #include <linux/scatterlist.h> | 29 | #include <linux/scatterlist.h> |
| 30 | #include <asm/semaphore.h> | ||
| 31 | #include <asm/uaccess.h> | 30 | #include <asm/uaccess.h> |
| 32 | 31 | ||
| 33 | MODULE_LICENSE("GPL"); | 32 | MODULE_LICENSE("GPL"); |