diff --git a/[refs] b/[refs] index dc541525f810..861acea4e90f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 510043da8582ad49d22a1e9a6b211e6ede10cd2e +refs/heads/master: bbe4432e669ab94fc8059e7ab878cafad7b8d123 diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c index ff7c836ff001..946ed86a0595 100644 --- a/trunk/drivers/kvm/kvm_main.c +++ b/trunk/drivers/kvm/kvm_main.c @@ -2299,7 +2299,7 @@ static struct file_operations kvm_chardev_ops = { }; static struct miscdevice kvm_dev = { - MISC_DYNAMIC_MINOR, + KVM_MINOR, "kvm", &kvm_chardev_ops, }; diff --git a/trunk/include/linux/miscdevice.h b/trunk/include/linux/miscdevice.h index 326da7d500c7..dff9ea32606a 100644 --- a/trunk/include/linux/miscdevice.h +++ b/trunk/include/linux/miscdevice.h @@ -29,6 +29,7 @@ #define TUN_MINOR 200 #define HPET_MINOR 228 +#define KVM_MINOR 232 struct device;