fuse: move FUSE_MINOR to miscdevice.h

Move FUSE_MINOR to miscdevice.h.  While at it, de-uglify the file.

Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>

diff --git a/include/linux/fuse.h b/include/linux/fuse.h
index 350fe97..7caa473 100644 (file)
--- a/include/linux/fuse.h
+++ b/include/linux/fuse.h
@@ -40,9 +40,6 @@
 /** The major number of the fuse character device */
 #define FUSE_MAJOR MISC_MAJOR
 
-/** The minor number of the fuse character device */
-#define FUSE_MINOR 229
-
 /* Make sure all structures are padded to 64bit boundary, so 32bit
    userspace works under 64bit kernels */
 

diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index 26433ec..a820f81 100644 (file)
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -3,33 +3,33 @@
 #include <linux/module.h>
 #include <linux/major.h>
 
-#define PSMOUSE_MINOR  1
-#define MS_BUSMOUSE_MINOR 2
-#define ATIXL_BUSMOUSE_MINOR 3
-/*#define AMIGAMOUSE_MINOR 4   FIXME OBSOLETE */
-#define ATARIMOUSE_MINOR 5
-#define SUN_MOUSE_MINOR 6
-#define APOLLO_MOUSE_MINOR 7
-#define PC110PAD_MINOR 9
-/*#define ADB_MOUSE_MINOR 10   FIXME OBSOLETE */
+#define PSMOUSE_MINOR          1
+#define MS_BUSMOUSE_MINOR      2
+#define ATIXL_BUSMOUSE_MINOR   3
+/*#define AMIGAMOUSE_MINOR     4       FIXME OBSOLETE */
+#define ATARIMOUSE_MINOR       5
+#define SUN_MOUSE_MINOR                6
+#define APOLLO_MOUSE_MINOR     7
+#define PC110PAD_MINOR         9
+/*#define ADB_MOUSE_MINOR      10      FIXME OBSOLETE */
 #define WATCHDOG_MINOR         130     /* Watchdog timer     */
 #define TEMP_MINOR             131     /* Temperature Sensor */
-#define RTC_MINOR 135
+#define RTC_MINOR              135
 #define EFI_RTC_MINOR          136     /* EFI Time services */
-#define SUN_OPENPROM_MINOR 139
+#define SUN_OPENPROM_MINOR     139
 #define DMAPI_MINOR            140     /* DMAPI */
-#define NVRAM_MINOR 144
-#define SGI_MMTIMER        153
+#define NVRAM_MINOR            144
+#define SGI_MMTIMER            153
 #define STORE_QUEUE_MINOR      155
-#define I2O_MINOR 166
+#define I2O_MINOR              166
 #define MICROCODE_MINOR                184
-#define MWAVE_MINOR    219             /* ACP/Mwave Modem */
-#define MPT_MINOR      220
-#define MISC_DYNAMIC_MINOR 255
-
-#define TUN_MINOR           200
-#define        HPET_MINOR           228
-#define KVM_MINOR            232
+#define TUN_MINOR              200
+#define MWAVE_MINOR            219     /* ACP/Mwave Modem */
+#define MPT_MINOR              220
+#define HPET_MINOR             228
+#define FUSE_MINOR             229
+#define KVM_MINOR              232
+#define MISC_DYNAMIC_MINOR     255
 
 struct device;