Merge branches 'acpi-dock', 'acpi-ec' and 'acpi-scan'

[cascardo/linux.git] / arch / sparc / kernel / traps_32.c

diff --git a/arch/sparc/kernel/traps_32.c b/arch/sparc/kernel/traps_32.c
index 6fd386c..4f21df7 100644 (file)
--- a/arch/sparc/kernel/traps_32.c
+++ b/arch/sparc/kernel/traps_32.c
@@ -433,7 +433,6 @@ void trap_init(void)
        /* Force linker to barf if mismatched */
        if (TI_UWINMASK    != offsetof(struct thread_info, uwinmask) ||
            TI_TASK        != offsetof(struct thread_info, task) ||
-           TI_EXECDOMAIN  != offsetof(struct thread_info, exec_domain) ||
            TI_FLAGS       != offsetof(struct thread_info, flags) ||
            TI_CPU         != offsetof(struct thread_info, cpu) ||
            TI_PREEMPT     != offsetof(struct thread_info, preempt_count) ||