Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9f61565 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.19.23 (29aa0fb9) into msm-4.19"

parents e70e3a4a bdcfc4dd

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 21

SUBLEVEL = 23

EXTRAVERSION =

NAME = "People's Front"

arch/arm/boot/dts/da850.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ 
		clocksource: timer@20000 {

			compatible = "ti,da830-timer";

			reg = <0x20000 0x1000>;

			interrupts = <12>, <13>;

			interrupts = <21>, <22>;

			interrupt-names = "tint12", "tint34";

			clocks = <&pll0_auxclk>;

		};

arch/arm/mach-iop32x/n2100.c

+1 −2
Original line number Diff line number Diff line
@@ -75,8 +75,7 @@ void __init n2100_map_io(void) 
/*

 * N2100 PCI.

 */

static int __init

n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

static int n2100_pci_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	int irq;

arch/arm/mach-tango/pm.c

+2 −4
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <linux/suspend.h>

#include <asm/suspend.h>

#include "smc.h"

#include "pm.h"



static int tango_pm_powerdown(unsigned long arg)

{
@@ -24,10 +25,7 @@ static const struct platform_suspend_ops tango_pm_ops = { 
	.valid = suspend_valid_only_mem,

};



static int __init tango_pm_init(void)

void __init tango_pm_init(void)

{

	suspend_set_ops(&tango_pm_ops);

	return 0;

}
 


late_initcall(tango_pm_init);

arch/arm/mach-tango/pm.h

0 → 100644
+7 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */



#ifdef CONFIG_SUSPEND

void __init tango_pm_init(void);

#else

#define tango_pm_init NULL

#endif