diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-12-10 17:23:48 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-12-10 17:23:48 +0100 |
| commit | 7eccfebf65f0ba2d41dbd053e29a9b6287f406da (patch) | |
| tree | b7b93ce81edbcf5cf27e9d274561db223ebb91fa /net/nfc/nfc.h | |
| parent | 31ade3b83e1821da5fbb2f11b5b3d4ab2ec39db8 (diff) | |
| parent | d1f15aa09558d00ed23168686156f7341f9d9d86 (diff) | |
Merge tag 'reset-for-4.5' of git://git.pengutronix.de/git/pza/linux into next/drivers
Merge "Reset controller changes for v4.5" from Philipp Zabel:
- oftree support for getting reset devices by index
- fixed return value consistency of of_reset_control_get
- added support for STi co-processor resets
- added STi status callback
- various fixes
* tag 'reset-for-4.5' of git://git.pengutronix.de/git/pza/linux:
reset: check return value of reset_controller_register()
reset: remove redundant $(CONFIG_RESET_CONTROLLER) from Makefile
reset: use ENOTSUPP instead of ENOSYS
reset: sunxi: mark the of_device_id array as __initconst
reset: sti: add a missing blank line after declaration
reset: sti: Provide ops .status() call-back
reset: sti: Add support for resetting co-processors
ARM: STi: Add DT defines for co-processor reset lines
reset: Fix of_reset_control_get() for consistent return values
reset: add of_reset_control_get_by_index()
Diffstat (limited to 'net/nfc/nfc.h')
0 files changed, 0 insertions, 0 deletions