git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus
[pandora-kernel.git]
/
include
/
linux
/
dm-ioctl.h
diff --git
a/include/linux/dm-ioctl.h
b/include/linux/dm-ioctl.h
index
0cb8eff
..
75fd557
100644
(file)
--- a/
include/linux/dm-ioctl.h
+++ b/
include/linux/dm-ioctl.h
@@
-267,9
+267,9
@@
enum {
#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
#define DM_VERSION_MAJOR 4
#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)
#define DM_VERSION_MAJOR 4
-#define DM_VERSION_MINOR 2
1
+#define DM_VERSION_MINOR 2
2
#define DM_VERSION_PATCHLEVEL 0
#define DM_VERSION_PATCHLEVEL 0
-#define DM_VERSION_EXTRA "-ioctl (2011-
07-06
)"
+#define DM_VERSION_EXTRA "-ioctl (2011-
10-19
)"
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */
/* Status bits */
#define DM_READONLY_FLAG (1 << 0) /* In/Out */