Pull char / misc driver patches from Greg KH: "Here's the big driver misc / char pull request for 3.17-rc1. Lots of things in here, the thunderbolt support for Apple laptops, some other new drivers, testing fixes, and other good things. All have been in linux-next for a long time" * tag 'char-misc-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (119 commits) misc: bh1780: Introduce the use of devm_kzalloc Lattice ECP3 FPGA: Correct endianness drivers/misc/ti-st: Load firmware from ti-connectivity directory. dt-bindings: extcon: Add support for SM5502 MUIC device extcon: sm5502: Change internal hardware switch according to cable type extcon: sm5502: Detect cable state after completing platform booting extcon: sm5502: Add support new SM5502 extcon device driver extcon: arizona: Get MICVDD against extcon device extcon: Remove unnecessary OOM messages misc: vexpress: Fix sparse non static symbol warnings mei: drop unused hw dependent fw status functions misc: bh1770glc: Use managed functions pcmcia: remove DEFINE_PCI_DEVICE_TABLE usage misc: remove DEFINE_PCI_DEVICE_TABLE usage ipack: Replace DEFINE_PCI_DEVICE_TABLE macro use drivers/char/dsp56k.c: drop check for negativity of unsigned parameter mei: fix return value on disconnect timeout mei: don't schedule suspend in pm idle mei: start disconnect request timer consistently mei: reset client connection state on timeout ...
Showing the changes to include/uapi/linux (2 of 140 files). Show all
Unified · Split
| @@ -328,6 +328,7 @@ enum genwqe_card_state { · 327 unmodified lines | ||
| 328 | 328 | GENWQE_CARD_UNUSED = 0, |
| 329 | 329 | GENWQE_CARD_USED = 1, |
| 330 | 330 | GENWQE_CARD_FATAL_ERROR = 2, |
| 331 | + GENWQE_CARD_RELOAD_BITSTREAM = 3, | |
| 331 | 332 | GENWQE_CARD_STATE_MAX, |
| 332 | 333 | }; |
| 333 | 334 | |
| @@ -34,7 +34,8 @@ · 33 unmodified lines | ||
| 34 | 34 | #define I8K_FAN_OFF 0 |
| 35 | 35 | #define I8K_FAN_LOW 1 |
| 36 | 36 | #define I8K_FAN_HIGH 2 |
| 37 | −#define I8K_FAN_MAX I8K_FAN_HIGH | |
| 37 | +#define I8K_FAN_TURBO 3 | |
| 38 | +#define I8K_FAN_MAX I8K_FAN_TURBO | |
| 38 | 39 | |
| 39 | 40 | #define I8K_VOL_UP 1 |
| 40 | 41 | #define I8K_VOL_DOWN 2 |