These are preparatory changes for LED block device activity trigger. Some drivers internally defines LED_OFF and LED_ON, but they conflict with the LED subsystem's LED_OFF and LED_ON enums. This renames these driver's LED_* definisions to avoid the name collision. Akinobu Mita (3): block: umem: rename LED_* macros to LEDCTRL_* scsi: mvsas: rename LED_* enums to SGPIO_LED_* scsi: nsp32: rename LED_* macros to EXT_PORT_LED_* drivers/block/umem.c | 20 ++++++++++---------- drivers/block/umem.h | 20 ++++++++++---------- drivers/scsi/mvsas/mv_94xx.c | 2 +- drivers/scsi/mvsas/mv_94xx.h | 24 ++++++++++++------------ drivers/scsi/nsp32.c | 6 +++--- drivers/scsi/nsp32.h | 4 ++-- 6 files changed, 38 insertions(+), 38 deletions(-) Cc: Frank Steiner <fsteiner-mail1@xxxxxxxxxxxxxx> Cc: Jacek Anaszewski <jacek.anaszewski@xxxxxxxxx> Cc: Pavel Machek <pavel@xxxxxx> Cc: Dan Murphy <dmurphy@xxxxxx> Cc: Jens Axboe <axboe@xxxxxxxxx> Cc: "James E.J. Bottomley" <jejb@xxxxxxxxxxxxx> Cc: "Martin K. Petersen" <martin.petersen@xxxxxxxxxx> Cc: GOTO Masanori <gotom@xxxxxxxxxxxx> Cc: YOKOTA Hiroshi <yokota@xxxxxxxxxxxxxxxxxxxxxxx> -- 2.7.4
