summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2014-01-10 13:17:17 +1100
committerStephen Rothwell <sfr@canb.auug.org.au>2014-01-10 13:17:17 +1100
commitf7f483b7c64695af05e1ce58cc23001631281fe4 (patch)
tree843a60d4e058568d7a4ce8ff4468cab1977b0a07 /include
parent7c276952af7be2c6f050cb4884873cac291ee338 (diff)
parentd10999016f4164e9b80f1b3dece3842087cfa3bb (diff)
Merge remote-tracking branch 'vfio/next'
Diffstat (limited to 'include')
-rw-r--r--include/linux/miscdevice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index f7eaf2d60083..3737f7218f51 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -30,6 +30,7 @@
#define STORE_QUEUE_MINOR 155
#define I2O_MINOR 166
#define MICROCODE_MINOR 184
+#define VFIO_MINOR 196
#define TUN_MINOR 200
#define CUSE_MINOR 203
#define MWAVE_MINOR 219 /* ACP/Mwave Modem */