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

Commit 2287593f authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "spmi: qpnp-int: move qpnp-int.h under include/linux/irqchip"

parents c5f4dc6e 1a06f7cc

arch/arm/mach-msm/board-8092.c

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <mach/socinfo.h>

#include <mach/board.h>

#include <mach/msm_memtypes.h>

#include <mach/qpnp-int.h>

#include <soc/msm/smem.h>

#include <mach/msm_smd.h>

#include <mach/restart.h>

arch/arm/mach-msm/board-dt.c

+1 −1
Original line number Diff line number Diff line
@@ -17,10 +17,10 @@ 
#include <linux/of_fdt.h>

#include <linux/mfd/wcd9xxx/core.h>

#include <linux/irqchip.h>

#include <linux/irqchip/qpnp-int.h>

#include <asm/mach/map.h>

#include <asm/hardware/cache-l2x0.h>

#include <mach/mpm.h>

#include <mach/qpnp-int.h>

#include <mach/msm_iomap.h>

#include <mach/scm.h>

drivers/spmi/qpnp-int.c

+1 −2
Original line number Diff line number Diff line
@@ -27,10 +27,9 @@ 
#include <linux/slab.h>

#include <linux/printk.h>

#include <linux/ratelimit.h>

#include <linux/irqchip/qpnp-int.h>



#include <asm/irq.h>

#include <asm/mach/irq.h>

#include <mach/qpnp-int.h>



/* 16 slave_ids, 256 per_ids per slave, and 8 ints per per_id */

#define QPNPINT_NR_IRQS		(16 * 256 * 8)

drivers/spmi/spmi-pmic-arb.c

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
#include <linux/module.h>

#include <linux/seq_file.h>

#include <linux/syscore_ops.h>

#include <mach/qpnp-int.h>

#include <linux/irqchip/qpnp-int.h>

#include "spmi-dbgfs.h"



#define SPMI_PMIC_ARB_NAME		"spmi_pmic_arb"

arch/arm/mach-msm/include/mach/qpnp-int.h→include/linux/irqchip/qpnp-int.h

+0 −2
Original line number Diff line number Diff line
@@ -103,13 +103,11 @@ static inline int __init qpnpint_of_init(struct device_node *node, 
static inline int qpnpint_register_controller(struct device_node *node,

					      struct spmi_controller *ctrl,

					      struct qpnp_local_int *li_cb)



{

	return -ENXIO;

}



static inline int qpnpint_unregister_controller(struct device_node *node)



{

	return -ENXIO;

}