git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'spi-v4.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
configs
/
collie_defconfig
diff --git
a/arch/arm/configs/collie_defconfig
b/arch/arm/configs/collie_defconfig
index 6c56ad086c7ca8deed6ffa75aeb86925c8e83150..52dbad5619e276825297acd283e628c47816a121 100644
(file)
--- a/
arch/arm/configs/collie_defconfig
+++ b/
arch/arm/configs/collie_defconfig
@@
-76,7
+76,7
@@
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_LOCOMO=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_TIMER=y
-CONFIG_LEDS_TRIGGER_
IDE_
DISK=y
+CONFIG_LEDS_TRIGGER_DISK=y
# CONFIG_DNOTIFY is not set
CONFIG_VFAT_FS=y
CONFIG_TMPFS=y