aboutsummaryrefslogtreecommitdiff
path: root/drivers/firmware/imx
diff options
context:
space:
mode:
authorZhenzhong Duan <[email protected]>2020-03-11 15:16:54 +0800
committerGreg Kroah-Hartman <[email protected]>2020-03-18 12:27:04 +0100
commit2668dba6df53584fb147d656c45a600d9e723dcb (patch)
tree3da9ef7910221f7c31bed831b12017d6b7c44a5f /drivers/firmware/imx
parent6ce6ae7c178b95f83ca0e15bd2ac961425a3af5c (diff)
misc: move FLASH_MINOR into miscdevice.h and fix conflicts
FLASH_MINOR is used in both drivers/char/nwflash.c and drivers/sbus/char/flash.c with conflict minor numbers. Move all the definitions of FLASH_MINOR into miscdevice.h. Rename FLASH_MINOR for drivers/char/nwflash.c to NWFLASH_MINOR and FLASH_MINOR for drivers/sbus/char/flash.c to SBUS_FLASH_MINOR. Link: https://lore.kernel.org/lkml/[email protected]/t/ Suggested-by: Arnd Bergmann <[email protected]> Signed-off-by: Zhenzhong Duan <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Cc: Greg Kroah-Hartman <[email protected]> Cc: Russell King <[email protected]> Cc: "David S. Miller" <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
Diffstat (limited to 'drivers/firmware/imx')
0 files changed, 0 insertions, 0 deletions