x86, genapic: rename int_delivery_mode, et. al.

[linux-2.6-block.git] / arch / x86 / kernel / genapic_flat_64.c

diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c
index e9233374cef1c5aad7a5f5627f719167a530ddee..0a263d6bb5e270908445c9d5abfd08cde5738b1b 100644 (file)
--- a/arch/x86/kernel/genapic_flat_64.c
+++ b/arch/x86/kernel/genapic_flat_64.c
@@ -180,8 +180,8 @@ struct genapic apic_flat =  {
        .acpi_madt_oem_check            = flat_acpi_madt_oem_check,
        .apic_id_registered             = flat_apic_id_registered,
 
-       .int_delivery_mode              = dest_LowestPrio,
-       .int_dest_mode                  = (APIC_DEST_LOGICAL != 0),
+       .irq_delivery_mode              = dest_LowestPrio,
+       .irq_dest_mode                  = (APIC_DEST_LOGICAL != 0),
 
        .target_cpus                    = flat_target_cpus,
        .ESR_DISABLE                    = 0,
@@ -326,8 +326,8 @@ struct genapic apic_physflat =  {
        .acpi_madt_oem_check            = physflat_acpi_madt_oem_check,
        .apic_id_registered             = flat_apic_id_registered,
 
-       .int_delivery_mode              = dest_Fixed,
-       .int_dest_mode                  = (APIC_DEST_PHYSICAL != 0),
+       .irq_delivery_mode              = dest_Fixed,
+       .irq_dest_mode                  = (APIC_DEST_PHYSICAL != 0),
 
        .target_cpus                    = physflat_target_cpus,
        .ESR_DISABLE                    = 0,