summaryrefslogtreecommitdiff
path: root/include/linux/loop.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-20 11:23:28 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-20 11:23:28 +0300
commit0ce1c383681370964e7f77dd44506aeb3a6ba657 (patch)
tree75aa590c636feed7d110c03eddb56cc518fc034c /include/linux/loop.h
parent0a2a18b721abc960fbcada406746877d22340a60 (diff)
parent1de9e8e70f5acc441550ca75433563d91b269bbe (diff)
downloadlinux-0ce1c383681370964e7f77dd44506aeb3a6ba657.tar.xz
Merge commit 'v2.6.29-rc2' into x86/mm
Diffstat (limited to 'include/linux/loop.h')
-rw-r--r--include/linux/loop.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/loop.h b/include/linux/loop.h
index 46169a7b559b..6ffd6db5bb0d 100644
--- a/include/linux/loop.h
+++ b/include/linux/loop.h
@@ -80,7 +80,7 @@ enum {
};
#include <asm/posix_types.h> /* for __kernel_old_dev_t */
-#include <asm/types.h> /* for __u64 */
+#include <linux/types.h> /* for __u64 */
/* Backwards compatibility version */
struct loop_info {