diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2013-05-12 10:14:07 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2013-06-29 04:46:45 -0400 |
| commit | 83a8761142cb38536e9e88dfc2432d331ea4e257 (patch) | |
| tree | ff4d62cb9f0380b9fe0891f9d0c09fa748b369ba | |
| parent | e06aeb571653ffb4398e915bba3a34af665ae98b (diff) | |
move linux/loop.h to drivers/block
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
| -rw-r--r-- | drivers/block/cryptoloop.c | 2 | ||||
| -rw-r--r-- | drivers/block/loop.c | 2 | ||||
| -rw-r--r-- | drivers/block/loop.h (renamed from include/linux/loop.h) | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/block/cryptoloop.c b/drivers/block/cryptoloop.c index 8b6bb764b0a3..99e773cb70d0 100644 --- a/drivers/block/cryptoloop.c +++ b/drivers/block/cryptoloop.c | |||
| @@ -25,9 +25,9 @@ | |||
| 25 | #include <linux/string.h> | 25 | #include <linux/string.h> |
| 26 | #include <linux/crypto.h> | 26 | #include <linux/crypto.h> |
| 27 | #include <linux/blkdev.h> | 27 | #include <linux/blkdev.h> |
| 28 | #include <linux/loop.h> | ||
| 29 | #include <linux/scatterlist.h> | 28 | #include <linux/scatterlist.h> |
| 30 | #include <asm/uaccess.h> | 29 | #include <asm/uaccess.h> |
| 30 | #include "loop.h" | ||
| 31 | 31 | ||
| 32 | MODULE_LICENSE("GPL"); | 32 | MODULE_LICENSE("GPL"); |
| 33 | MODULE_DESCRIPTION("loop blockdevice transferfunction adaptor / CryptoAPI"); | 33 | MODULE_DESCRIPTION("loop blockdevice transferfunction adaptor / CryptoAPI"); |
diff --git a/drivers/block/loop.c b/drivers/block/loop.c index d92d50fd84b7..40e715531aa6 100644 --- a/drivers/block/loop.c +++ b/drivers/block/loop.c | |||
| @@ -63,7 +63,6 @@ | |||
| 63 | #include <linux/init.h> | 63 | #include <linux/init.h> |
| 64 | #include <linux/swap.h> | 64 | #include <linux/swap.h> |
| 65 | #include <linux/slab.h> | 65 | #include <linux/slab.h> |
| 66 | #include <linux/loop.h> | ||
| 67 | #include <linux/compat.h> | 66 | #include <linux/compat.h> |
| 68 | #include <linux/suspend.h> | 67 | #include <linux/suspend.h> |
| 69 | #include <linux/freezer.h> | 68 | #include <linux/freezer.h> |
| @@ -76,6 +75,7 @@ | |||
| 76 | #include <linux/sysfs.h> | 75 | #include <linux/sysfs.h> |
| 77 | #include <linux/miscdevice.h> | 76 | #include <linux/miscdevice.h> |
| 78 | #include <linux/falloc.h> | 77 | #include <linux/falloc.h> |
| 78 | #include "loop.h" | ||
| 79 | 79 | ||
| 80 | #include <asm/uaccess.h> | 80 | #include <asm/uaccess.h> |
| 81 | 81 | ||
diff --git a/include/linux/loop.h b/drivers/block/loop.h index 460b60fa7adf..90df5d6485b6 100644 --- a/include/linux/loop.h +++ b/drivers/block/loop.h | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * include/linux/loop.h | 2 | * loop.h |
| 3 | * | 3 | * |
| 4 | * Written by Theodore Ts'o, 3/29/93. | 4 | * Written by Theodore Ts'o, 3/29/93. |
| 5 | * | 5 | * |
