Merge branch 'master' of https://github.com/armbian/build
This commit is contained in:
commit
841b652b2b
@ -29,6 +29,7 @@ case $BRANCH in
|
||||
;spi;u-boot-spl.kwb:u-boot.flash
|
||||
;uart;u-boot-spl.kwb:u-boot.uart"
|
||||
|
||||
KERNELBRANCH='branch:linux-5.7.y'
|
||||
LINUXCONFIG='linux-mvebu-dev'
|
||||
KERNELPATCHDIR="mvebu-dev"
|
||||
|
||||
|
||||
@ -154,9 +154,9 @@ index b20a275..50eeee3 100644
|
||||
--- a/include/linux/libata.h
|
||||
+++ b/include/linux/libata.h
|
||||
@@ -38,6 +38,7 @@
|
||||
#include <linux/acpi.h>
|
||||
#include <linux/cdrom.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/async.h>
|
||||
+#include <linux/leds.h>
|
||||
|
||||
/*
|
||||
|
||||
@ -194,10 +194,10 @@ index adc768f908f1..a2bd264ee92c 100644
|
||||
mvchip->mvpwm = mvpwm;
|
||||
mvpwm->mvchip = mvchip;
|
||||
|
||||
- mvpwm->membase = devm_ioremap_resource(dev, res);
|
||||
- mvpwm->membase = devm_platform_ioremap_resource_byname(pdev, "pwm");
|
||||
- if (IS_ERR(mvpwm->membase))
|
||||
- return PTR_ERR(mvpwm->membase);
|
||||
+ mvpwm->controller.membase = devm_ioremap_resource(dev, res);
|
||||
+ mvpwm->controller.membase = devm_platform_ioremap_resource_byname(pdev, "pwm");
|
||||
+ if (IS_ERR(mvpwm->controller.membase))
|
||||
+ return PTR_ERR(mvpwm->controller.membase);
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user