summaryrefslogtreecommitdiffstats
path: root/include/linux/loop.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-02-04 14:54:56 +0100
committerIngo Molnar <mingo@elte.hu>2009-02-04 14:54:56 +0100
commitbb960a1e42042e82447a5bc0941b3ab6d614bac3 (patch)
treed2295a923fabb1b01b25bb015c4c2e42ee9df5ca /include/linux/loop.h
parent858770619debfb9269add63e4ba8b7c6b5538dd1 (diff)
parent06fc732c33a7ff5e4c91bcf4a6ca86b5e335ad9a (diff)
downloadop-kernel-dev-bb960a1e42042e82447a5bc0941b3ab6d614bac3.zip
op-kernel-dev-bb960a1e42042e82447a5bc0941b3ab6d614bac3.tar.gz
Merge branch 'core/xen' into x86/urgent
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 46169a7..6ffd6db 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 {
OpenPOWER on IntegriCloud