diff options
author | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:14 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2015-08-05 13:55:14 +0000 |
commit | caa73eb95c490e850d517cb558e4161c2f06d86f (patch) | |
tree | 615a1a64e1cfaaf0220f5c9ae49d465ee8566168 /target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch | |
parent | 0b15f91ed6d556aafcd56ffabb9da7ba83b317f5 (diff) | |
download | mtk-20170518-caa73eb95c490e850d517cb558e4161c2f06d86f.zip mtk-20170518-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.gz mtk-20170518-caa73eb95c490e850d517cb558e4161c2f06d86f.tar.bz2 |
kernel: update 4.1 to 4.1.4
Changelog:
* https://www.kernel.org/pub/linux/kernel/v4.x/ChangeLog-4.1.4
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
[jogo: fix brcm2708 patches, refresh target patches]
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46560
Diffstat (limited to 'target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch')
-rw-r--r-- | target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch b/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch index 8c087dc..104736c 100644 --- a/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch +++ b/target/linux/mxs/patches-4.1/101-mxs-add-mxs_power.patch @@ -1,5 +1,3 @@ -diff --git a/drivers/power/Kconfig b/drivers/power/Kconfig -index 4091fb0..0fcc158 100644 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@ -43,6 +43,14 @@ config MAX8925_POWER @@ -17,11 +15,9 @@ index 4091fb0..0fcc158 100644 config WM831X_BACKUP tristate "WM831X backup battery charger support" depends on MFD_WM831X -diff --git a/drivers/power/Makefile b/drivers/power/Makefile -index b7b0181..8edcad7 100644 --- a/drivers/power/Makefile +++ b/drivers/power/Makefile -@@ -10,6 +10,7 @@ obj-$(CONFIG_GENERIC_ADC_BATTERY) += generic-adc-battery.o +@@ -10,6 +10,7 @@ obj-$(CONFIG_GENERIC_ADC_BATTERY) += gen obj-$(CONFIG_PDA_POWER) += pda_power.o obj-$(CONFIG_APM_POWER) += apm_power.o obj-$(CONFIG_MAX8925_POWER) += max8925_power.o @@ -29,9 +25,6 @@ index b7b0181..8edcad7 100644 obj-$(CONFIG_WM831X_BACKUP) += wm831x_backup.o obj-$(CONFIG_WM831X_POWER) += wm831x_power.o obj-$(CONFIG_WM8350_POWER) += wm8350_power.o -diff --git a/drivers/power/mxs_power.c b/drivers/power/mxs_power.c -new file mode 100644 -index 0000000..669bfb1 --- /dev/null +++ b/drivers/power/mxs_power.c @@ -0,0 +1,136 @@ |