summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCorentin Labbe <clabbe.montjoie@gmail.com>2016-12-15 22:36:33 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-01-10 23:46:41 +0300
commit874bcd00f520cac297aefade201c4efc07fc8d17 (patch)
treeae4a5c5189c5437926400c392174c4df2a9bf1b2
parent8681d5b04f812d9cc5cde72bbbb5081f8f1c9728 (diff)
downloadlinux-874bcd00f520cac297aefade201c4efc07fc8d17.tar.xz
apm-emulation: move APM_MINOR_DEV to include/linux/miscdevice.h
This patch move the define for APM_MINOR_DEV to include/linux/miscdevice.h It is better that all minor number definitions are in the same place. Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/char/apm-emulation.c7
-rw-r--r--include/linux/miscdevice.h1
2 files changed, 1 insertions, 7 deletions
diff --git a/drivers/char/apm-emulation.c b/drivers/char/apm-emulation.c
index dd9dfa15e9d1..1dfb9f8de171 100644
--- a/drivers/char/apm-emulation.c
+++ b/drivers/char/apm-emulation.c
@@ -31,13 +31,6 @@
#include <linux/kthread.h>
#include <linux/delay.h>
-
-/*
- * The apm_bios device is one of the misc char devices.
- * This is its minor number.
- */
-#define APM_MINOR_DEV 134
-
/*
* One option can be changed at boot time as follows:
* apm=on/off enable/disable APM
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h
index ed30d5d713e3..0590263c462c 100644
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
@@ -22,6 +22,7 @@
/*#define ADB_MOUSE_MINOR 10 FIXME OBSOLETE */
#define WATCHDOG_MINOR 130 /* Watchdog timer */
#define TEMP_MINOR 131 /* Temperature Sensor */
+#define APM_MINOR_DEV 134
#define RTC_MINOR 135
#define EFI_RTC_MINOR 136 /* EFI Time services */
#define VHCI_MINOR 137