diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-12 11:53:16 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-11-12 11:53:16 -0800 |
| commit | f78e9de80f5ad15719a069a4e6c11e2777122188 (patch) | |
| tree | 180f7cf3ec3327c132fda8ab7352f5092a8077dd /kernel | |
| parent | 3b81bf78b7338bcc66581593e604e95addc546cc (diff) | |
| parent | efe6f16c6faf724882ddaba2eda8830a87bcc2b2 (diff) | |
| download | linux-f78e9de80f5ad15719a069a4e6c11e2777122188.tar.gz linux-f78e9de80f5ad15719a069a4e6c11e2777122188.tar.bz2 linux-f78e9de80f5ad15719a069a4e6c11e2777122188.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
Pull input updates from Dmitry Torokhov:
"Just one new driver (Cypress StreetFighter touchkey), and no input
core changes this time.
Plus various fixes and enhancements to existing drivers"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input: (54 commits)
Input: iforce - fix control-message timeout
Input: wacom_i2c - use macros for the bit masks
Input: ili210x - reduce sample period to 15ms
Input: ili210x - improve polled sample spacing
Input: ili210x - special case ili251x sample read out
Input: elantench - fix misreporting trackpoint coordinates
Input: synaptics-rmi4 - Fix device hierarchy
Input: i8042 - Add quirk for Fujitsu Lifebook T725
Input: cap11xx - add support for cap1206
Input: remove unused header <linux/input/cy8ctmg110_pdata.h>
Input: ili210x - add ili251x firmware update support
Input: ili210x - export ili251x version details via sysfs
Input: ili210x - use resolution from ili251x firmware
Input: pm8941-pwrkey - respect reboot_mode for warm reset
reboot: export symbol 'reboot_mode'
Input: max77693-haptic - drop unneeded MODULE_ALIAS
Input: cpcap-pwrbutton - do not set input parent explicitly
Input: max8925_onkey - don't mark comment as kernel-doc
Input: ads7846 - do not attempt IRQ workaround when deferring probe
Input: ads7846 - use input_set_capability()
...
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/reboot.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kernel/reboot.c b/kernel/reboot.c index d6e0f9fb7f04..6bcc5d6a6572 100644 --- a/kernel/reboot.c +++ b/kernel/reboot.c @@ -33,6 +33,7 @@ EXPORT_SYMBOL(cad_pid); #define DEFAULT_REBOOT_MODE #endif enum reboot_mode reboot_mode DEFAULT_REBOOT_MODE; +EXPORT_SYMBOL_GPL(reboot_mode); enum reboot_mode panic_reboot_mode = REBOOT_UNDEFINED; /* |