diff --git a/[refs] b/[refs]
index b0440ef1e202..e0637bc1250a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f132f554cea3ad1333ff8ea1ac23e1085abd639e
+refs/heads/master: b80c043327ea4faac62a329a1d35f16c47a5128e
diff --git a/trunk/include/linux/drbd_limits.h b/trunk/include/linux/drbd_limits.h
index 7d956e91ae7b..6d0a24331ed2 100644
--- a/trunk/include/linux/drbd_limits.h
+++ b/trunk/include/linux/drbd_limits.h
@@ -16,7 +16,7 @@
 #define DEBUG_RANGE_CHECK 0
 
 #define DRBD_MINOR_COUNT_MIN 1
-#define DRBD_MINOR_COUNT_MAX (1U << 20)
+#define DRBD_MINOR_COUNT_MAX 255
 #define DRBD_MINOR_COUNT_DEF 32
 #define DRBD_MINOR_COUNT_SCALE '1'