diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:09:49 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-06-18 11:09:49 +0200 |
| commit | 8461689c67fc2ad3040bc019cccb541bccb5648f (patch) | |
| tree | eafcf756975739ef04aa91be2e053d6e1e8b9ccb /include/linux/irq.h | |
| parent | d48daf37a3d2e2b28a61e615c0fc538301edb0dd (diff) | |
| parent | 7eb9ae0799b1e9f0b77733b432bc5f6f055b020b (diff) | |
| download | linux-8461689c67fc2ad3040bc019cccb541bccb5648f.tar.gz linux-8461689c67fc2ad3040bc019cccb541bccb5648f.tar.bz2 linux-8461689c67fc2ad3040bc019cccb541bccb5648f.zip | |
Merge branch 'x86/apic' into x86/platform
Merge in x86/apic to solve a vector_allocation_domain() API change semantic merge conflict.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/irq.h')
| -rw-r--r-- | include/linux/irq.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 61f5cec031e0..47a937cd84af 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h @@ -150,9 +150,7 @@ struct irq_data { void *handler_data; void *chip_data; struct msi_desc *msi_desc; -#ifdef CONFIG_SMP cpumask_var_t affinity; -#endif }; /* |