tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

mips: use the new LED disk activity trigger

- platform: rename 'ide-disk' to 'disk-activity'
- defconfig: rename 'LEDS_TRIGGER_IDE_DISK' to 'LEDS_TRIGGER_DISK'

Signed-off-by: Stephan Linz <linz@li-pro.net>
Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>

authored by

Stephan Linz and committed by
Jacek Anaszewski dde00512 e5808227

+7 -7
+1 -1
arch/mips/configs/malta_qemu_32r6_defconfig
··· 146 146 CONFIG_LEDS_CLASS=y 147 147 CONFIG_LEDS_TRIGGERS=y 148 148 CONFIG_LEDS_TRIGGER_TIMER=y 149 - CONFIG_LEDS_TRIGGER_IDE_DISK=y 149 + CONFIG_LEDS_TRIGGER_DISK=y 150 150 CONFIG_LEDS_TRIGGER_HEARTBEAT=y 151 151 CONFIG_LEDS_TRIGGER_BACKLIGHT=y 152 152 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+1 -1
arch/mips/configs/maltaaprp_defconfig
··· 147 147 CONFIG_LEDS_CLASS=y 148 148 CONFIG_LEDS_TRIGGERS=y 149 149 CONFIG_LEDS_TRIGGER_TIMER=y 150 - CONFIG_LEDS_TRIGGER_IDE_DISK=y 150 + CONFIG_LEDS_TRIGGER_DISK=y 151 151 CONFIG_LEDS_TRIGGER_HEARTBEAT=y 152 152 CONFIG_LEDS_TRIGGER_BACKLIGHT=y 153 153 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+1 -1
arch/mips/configs/maltasmvp_eva_defconfig
··· 152 152 CONFIG_LEDS_CLASS=y 153 153 CONFIG_LEDS_TRIGGERS=y 154 154 CONFIG_LEDS_TRIGGER_TIMER=y 155 - CONFIG_LEDS_TRIGGER_IDE_DISK=y 155 + CONFIG_LEDS_TRIGGER_DISK=y 156 156 CONFIG_LEDS_TRIGGER_HEARTBEAT=y 157 157 CONFIG_LEDS_TRIGGER_BACKLIGHT=y 158 158 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+1 -1
arch/mips/configs/maltaup_defconfig
··· 146 146 CONFIG_LEDS_CLASS=y 147 147 CONFIG_LEDS_TRIGGERS=y 148 148 CONFIG_LEDS_TRIGGER_TIMER=y 149 - CONFIG_LEDS_TRIGGER_IDE_DISK=y 149 + CONFIG_LEDS_TRIGGER_DISK=y 150 150 CONFIG_LEDS_TRIGGER_HEARTBEAT=y 151 151 CONFIG_LEDS_TRIGGER_BACKLIGHT=y 152 152 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+1 -1
arch/mips/configs/rbtx49xx_defconfig
··· 90 90 CONFIG_LEDS_CLASS=y 91 91 CONFIG_LEDS_GPIO=y 92 92 CONFIG_LEDS_TRIGGERS=y 93 - CONFIG_LEDS_TRIGGER_IDE_DISK=y 93 + CONFIG_LEDS_TRIGGER_DISK=y 94 94 CONFIG_LEDS_TRIGGER_HEARTBEAT=y 95 95 CONFIG_RTC_CLASS=y 96 96 CONFIG_RTC_INTF_DEV_UIE_EMUL=y
+1 -1
arch/mips/txx9/generic/setup.c
··· 727 727 int i; 728 728 static char *default_triggers[] __initdata = { 729 729 "heartbeat", 730 - "ide-disk", 730 + "disk-activity", 731 731 "nand-disk", 732 732 NULL, 733 733 };
+1 -1
arch/mips/txx9/rbtx4939/setup.c
··· 215 215 int i; 216 216 static char *default_triggers[] __initdata = { 217 217 "heartbeat", 218 - "ide-disk", 218 + "disk-activity", 219 219 "nand-disk", 220 220 }; 221 221