Commit 77f349b7 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: defconfig: kill remnants of CONFIG_LEDS 



CONFIG_LEDS was replaced by CONFIG_NEW_LEDS over ten years ago with commit
fa8bbb13 ("ARM: use new LEDS CPU trigger stub to replace old one"),
but some defconfig files still reference it.

Replace it and its sub-options with the corresponding new versions.

Some of these machines may not actually have a new-style LED driver,
and I did not check them individually as most of the machines are
going away soon anyway.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 5746240f

arch/arm/configs/assabet_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_BLK_DEV_INITRD=y

CONFIG_ARCH_SA1100=y

CONFIG_SA1100_ASSABET=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_CMDLINE="mem=32M console=ttySA0,38400n8 initrd=0xc0800000,3M root=/dev/ram"

CONFIG_FPE_NWFPE=y

CONFIG_PM=y
@@ -42,6 +40,10 @@ CONFIG_FB=y 
CONFIG_FB_SA1100=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_SOUND=y

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_EXT2_FS=y

CONFIG_MSDOS_FS=y

CONFIG_TMPFS=y

arch/arm/configs/cerfcube_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -4,8 +4,6 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_ARCH_SA1100=y

CONFIG_SA1100_CERF=y

CONFIG_SA1100_CERF_FLASH_16MB=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_CMDLINE="console=ttySA0,38400 root=/dev/mtdblock3 rootfstype=jffs2 rw mem=32M init=/linuxrc"

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=m
@@ -46,6 +44,10 @@ CONFIG_SERIAL_SA1100_CONSOLE=y 
CONFIG_WATCHDOG=y

CONFIG_SA1100_WATCHDOG=m

# CONFIG_VGA_CONSOLE is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_EXT2_FS=m

CONFIG_EXT3_FS=m

CONFIG_MSDOS_FS=m

arch/arm/configs/footbridge_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ CONFIG_ARCH_FOOTBRIDGE=y 
CONFIG_ARCH_CATS=y

CONFIG_ARCH_EBSA285_HOST=y

CONFIG_ARCH_NETWINDER=y

CONFIG_LEDS=y

CONFIG_LEDS_TIMER=y

CONFIG_FPE_NWFPE=y

CONFIG_FPE_NWFPE_XP=y

CONFIG_BINFMT_AOUT=y
@@ -91,6 +89,10 @@ CONFIG_SOUND=m 
CONFIG_USB=m

CONFIG_USB_MON=m

CONFIG_USB_PRINTER=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_TIMER=y

CONFIG_EXT2_FS=y

CONFIG_AUTOFS4_FS=y

CONFIG_ISO9660_FS=m

arch/arm/configs/hackkit_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_BLK_DEV_INITRD=y

CONFIG_ARCH_SA1100=y

CONFIG_SA1100_HACKKIT=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_CMDLINE="console=ttySA0,115200 root=/dev/ram0 initrd=0xc0400000,8M init=/rootshell"

CONFIG_CPU_FREQ_GOV_PERFORMANCE=y

CONFIG_FPE_NWFPE=y
@@ -31,6 +29,10 @@ CONFIG_DUMMY=y 
CONFIG_SERIAL_SA1100=y

CONFIG_SERIAL_SA1100_CONSOLE=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_EXT2_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

arch/arm/configs/lart_defconfig

+4 −2
Original line number Diff line number Diff line
@@ -3,8 +3,6 @@ CONFIG_LOG_BUF_SHIFT=14 
CONFIG_BLK_DEV_INITRD=y

CONFIG_ARCH_SA1100=y

CONFIG_SA1100_LART=y

CONFIG_LEDS=y

CONFIG_LEDS_CPU=y

CONFIG_CMDLINE="console=ttySA0,9600 root=/dev/ram"

CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y

CONFIG_CPU_FREQ_GOV_USERSPACE=y
@@ -37,6 +35,10 @@ CONFIG_SERIAL_SA1100=y 
CONFIG_SERIAL_SA1100_CONSOLE=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_SOUND=m

CONFIG_NEW_LEDS=y

CONFIG_LEDS_CLASS=y

CONFIG_LEDS_TRIGGERS=y

CONFIG_LEDS_TRIGGER_CPU=y

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=m

CONFIG_REISERFS_FS=m