diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-09-27 18:13:53 -0400 |
| commit | aebb1153ac54ddbbd3d3f0481a193f4bf0ead53b (patch) | |
| tree | 57425aa83c8bed5b41af7e3408024fe1f2fdded9 /include/asm-x86_64/genapic.h | |
| parent | 022e7a12b6aa11a11de4d708fe8606c9a6734b37 (diff) | |
| parent | a77c64c1a641950626181b4857abb701d8f38ccc (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/asm-x86_64/genapic.h')
| -rw-r--r-- | include/asm-x86_64/genapic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asm-x86_64/genapic.h b/include/asm-x86_64/genapic.h index 50b38e7c58e4..81e714665344 100644 --- a/include/asm-x86_64/genapic.h +++ b/include/asm-x86_64/genapic.h | |||
| @@ -16,7 +16,6 @@ struct genapic { | |||
| 16 | char *name; | 16 | char *name; |
| 17 | u32 int_delivery_mode; | 17 | u32 int_delivery_mode; |
| 18 | u32 int_dest_mode; | 18 | u32 int_dest_mode; |
| 19 | u32 int_delivery_dest; /* for quick IPIs */ | ||
| 20 | int (*apic_id_registered)(void); | 19 | int (*apic_id_registered)(void); |
| 21 | cpumask_t (*target_cpus)(void); | 20 | cpumask_t (*target_cpus)(void); |
| 22 | void (*init_apic_ldr)(void); | 21 | void (*init_apic_ldr)(void); |