diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-13 07:39:37 +0100 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-01-13 07:39:37 +0100 |
| commit | 93f83f67e9372a9754f6d268cbdec1fe54465f8e (patch) | |
| tree | 681b4576f731f9edf78e501c0ed7797e5951aa20 /config-armv7 | |
| parent | 6aa75d775bc9e917afebc26717a5712e543e42f3 (diff) | |
| parent | 3775d0459a912df24eae8c4fe921714c62ea7e5a (diff) | |
| download | kernel-93f83f67e9372a9754f6d268cbdec1fe54465f8e.tar.gz kernel-93f83f67e9372a9754f6d268cbdec1fe54465f8e.tar.xz kernel-93f83f67e9372a9754f6d268cbdec1fe54465f8e.zip | |
Merge branch 'master' into f22-user-thl-vanilla-rawhidekernel-4.5.0-0.rc0.git1.1.vanilla.knurd.1.fc22
Diffstat (limited to 'config-armv7')
| -rw-r--r-- | config-armv7 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config-armv7 b/config-armv7 index eaa6d4ebf..65ce03dd9 100644 --- a/config-armv7 +++ b/config-armv7 @@ -265,7 +265,7 @@ CONFIG_WKUP_M3_RPROC=m # Builtin needed for BBone White CONFIG_MFD_TPS65217=y CONFIG_REGULATOR_TPS65217=y -CONFOG_CHARGER_TPS65217=m +CONFIG_CHARGER_TPS65217=m CONFIG_BACKLIGHT_TPS65217=m CONFIG_REGULATOR_TPS65217=m |