x86: acpi: Adjust order in acpi_table.c

[u-boot] / arch / x86 / include / asm / irq.h

diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index 46e1c3119486a5b9497cbfa49e5f21363ffcd160..ddb529e5813bb5830412fd97bd62621d899170be 100644 (file)
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -34,6 +34,8 @@ enum pirq_config {
  *             IRQ N is available to be routed
  * @lb_bdf:    irq router's PCI bus/device/function number encoding
  * @ibase:     IBASE register block base address
+ * @actl_8bit: ACTL register width is 8-bit (for ICH series chipset)
+ * @actl_addr: ACTL register offset
  */
 struct irq_router {
        int config;
@@ -41,6 +43,8 @@ struct irq_router {
        u16 irq_mask;
        u32 bdf;
        u32 ibase;
+       bool actl_8bit;
+       int actl_addr;
 };
 
 struct pirq_routing {
@@ -55,16 +59,6 @@ struct pirq_routing {
 
 #define PIRQ_BITMAP            0xdef8
 
-/**
- * cpu_irq_init() - Initialize CPU IRQ routing
- *
- * This initializes some platform-specific registers related to IRQ routing,
- * like configuring internal PCI devices to use which PCI interrupt pin,
- * and which PCI interrupt pin is mapped to which PIRQ line. Note on some
- * platforms, such IRQ routing might be hard-coded thus cannot configure.
- */
-void cpu_irq_init(void);
-
 /**
  * irq_router_common_init() - Perform common x86 interrupt init
  *