diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-02-08 15:54:03 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-02-08 15:54:03 +0100 |
| commit | 2f86e45a7f427d217f4b94603a9f43a14877e2cc (patch) | |
| tree | e4ee4d9fbd95e000873ae16473bcc0123c04d266 /drivers/irqchip/Kconfig | |
| parent | genirq: Clarify that irq wake state is orthogonal to enable/disable (diff) | |
| parent | irqchip/gic-v3-its: Rename VPENDBASER/VPROPBASER accessors (diff) | |
| download | linux-2f86e45a7f427d217f4b94603a9f43a14877e2cc.tar.xz linux-2f86e45a7f427d217f4b94603a9f43a14877e2cc.zip | |
Merge tag 'irqchip-fixes-5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes for 5.6, take #1 from Marc Zyngier:
- Guarantee allocation of L2 vPE table for GICv4.1
- Fix GICv4.1 VPROPBASER programming
- Numerous GICv4.1 tidy ups
- Fix disabled GICv3 redistributor provisioning with ACPI
- KConfig cleanup for C-SKY
Diffstat (limited to 'drivers/irqchip/Kconfig')
| -rw-r--r-- | drivers/irqchip/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig index 1006c694d9fb..6d397732138d 100644 --- a/drivers/irqchip/Kconfig +++ b/drivers/irqchip/Kconfig @@ -438,7 +438,7 @@ config CSKY_MPINTC help Say yes here to enable C-SKY SMP interrupt controller driver used for C-SKY SMP system. - In fact it's not mmio map in hw and it use ld/st to visit the + In fact it's not mmio map in hardware and it uses ld/st to visit the controller's register inside CPU. config CSKY_APB_INTC @@ -446,7 +446,7 @@ config CSKY_APB_INTC depends on CSKY help Say yes here to enable C-SKY APB interrupt controller driver used - by C-SKY single core SOC system. It use mmio map apb-bus to visit + by C-SKY single core SOC system. It uses mmio map apb-bus to visit the controller's register. config IMX_IRQSTEER |