Skip to content

Commit

Permalink
Merge tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/k…
Browse files Browse the repository at this point in the history
…ernel/git/khilman/linux-amlogic into next/arm64

Pull "Amlogic: defconfig changes for v4.12" from Kevin Hilman:

- enable PWM LEDs and LEDs default-on trigger

* tag 'amlogic-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  ARM64: defconfig: enable the leds-pwm driver and default-on trigger
  • Loading branch information
Arnd Bergmann committed Mar 30, 2017
2 parents 0563ff3 + 95fbe8b commit 6b0eb18
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/arm64/configs/defconfig
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,10 @@ CONFIG_MMC_SUNXI=y
CONFIG_NEW_LEDS=y
CONFIG_LEDS_CLASS=y
CONFIG_LEDS_GPIO=y
CONFIG_LEDS_PWM=y
CONFIG_LEDS_SYSCON=y
CONFIG_LEDS_TRIGGERS=y
CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_LEDS_TRIGGER_CPU=y
CONFIG_RTC_CLASS=y
Expand Down

0 comments on commit 6b0eb18

Please sign in to comment.