Merge branch 'pm-sleep'

[cascardo/linux.git] / arch / x86 / kernel / apic / apic_noop.c

diff --git a/arch/x86/kernel/apic/apic_noop.c b/arch/x86/kernel/apic/apic_noop.c
index 13d19ed..2cebf59 100644 (file)
--- a/arch/x86/kernel/apic/apic_noop.c
+++ b/arch/x86/kernel/apic/apic_noop.c
@@ -141,7 +141,6 @@ struct apic apic_noop = {
 
        .get_apic_id                    = noop_get_apic_id,
        .set_apic_id                    = NULL,
-       .apic_id_mask                   = 0x0F << 24,
 
        .cpu_mask_to_apicid_and         = flat_cpu_mask_to_apicid_and,