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.
Showing the changes to include/linux (1 of 4 files). Show all
Unified · Split
| @@ -30,12 +30,14 @@ · 29 unmodified lines | |||
| 30 | #define SUN_OPENPROM_MINOR 139 | 30 | #define SUN_OPENPROM_MINOR 139 |
| 31 | #define DMAPI_MINOR 140 /* unused */ | 31 | #define DMAPI_MINOR 140 /* unused */ |
| 32 | #define NVRAM_MINOR 144 | 32 | #define NVRAM_MINOR 144 |
| 33 | #define SBUS_FLASH_MINOR 152 | ||
| 33 | #define SGI_MMTIMER 153 | 34 | #define SGI_MMTIMER 153 |
| 34 | #define PMU_MINOR 154 | 35 | #define PMU_MINOR 154 |
| 35 | #define STORE_QUEUE_MINOR 155 /* unused */ | 36 | #define STORE_QUEUE_MINOR 155 /* unused */ |
| 36 | #define LCD_MINOR 156 | 37 | #define LCD_MINOR 156 |
| 37 | #define AC_MINOR 157 | 38 | #define AC_MINOR 157 |
| 38 | #define BUTTON_MINOR 158 /* Major 10, Minor 158, /dev/nwbutton */ | 39 | #define BUTTON_MINOR 158 /* Major 10, Minor 158, /dev/nwbutton */ |
| 40 | #define NWFLASH_MINOR 160 /* MAJOR is 10 - miscdevice */ | ||
| 39 | #define ENVCTRL_MINOR 162 | 41 | #define ENVCTRL_MINOR 162 |
| 40 | #define I2O_MINOR 166 | 42 | #define I2O_MINOR 166 |
| 41 | #define UCTRL_MINOR 174 | 43 | #define UCTRL_MINOR 174 |