diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:55:35 +1100 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 13:55:35 +1100 |
commit | cb551a11f22b8551da71752237078e5a3d4ba9d6 (patch) | |
tree | add425c43bd59a698724cbded24d0df884754a03 /include/linux/miscdevice.h | |
parent | 54d31691a051a57828074d1447012eabe6d14e5a (diff) | |
parent | 6cf18e6927c0b224f972e3042fb85770d63cb9f8 (diff) |
Merge remote-tracking branch 'char-misc/char-misc-next'
Diffstat (limited to 'include/linux/miscdevice.h')
-rw-r--r-- | include/linux/miscdevice.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/miscdevice.h b/include/linux/miscdevice.h index 5d81f739aa0a..762b5fec3383 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 |