From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751468Ab2AOQfo (ORCPT ); Sun, 15 Jan 2012 11:35:44 -0500 Received: from www.linutronix.de ([62.245.132.108]:44102 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751176Ab2AOQfn (ORCPT ); Sun, 15 Jan 2012 11:35:43 -0500 Date: Sun, 15 Jan 2012 17:35:38 +0100 From: Sebastian Andrzej Siewior To: Rob Herring Cc: linux-kernel@vger.kernel.org, devicetree-discuss@lists.ozlabs.org, Grant Likely , Rob Herring , x86@kernel.org, Thomas Gleixner Subject: Re: [PATCH] x86: convert to generic irq_domain Message-ID: <20120115163538.GA19026@linutronix.de> References: <1324099129-28832-1-git-send-email-robherring2@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Content-Disposition: inline In-Reply-To: <1324099129-28832-1-git-send-email-robherring2@gmail.com> X-Key-Id: 97C4700B X-Key-Fingerprint: 09E2 D1F3 9A3A FF13 C3D3 961C 0688 1C1E 97C4 700B User-Agent: Mutt/1.5.20 (2009-06-14) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org * Rob Herring | 2011-12-16 23:18:49 [-0600]: >From: Grant Likely > >This is needed to avoid struct collisions with the generic irq_domain >support being added to kernel/irq/generic-chip.c. > >Boot tested, but not on a DT enabled platform. If you add this piece into your patch: >>From 34d9bb9b582136c8412e14ad870c8aaaa28c9e15 Mon Sep 17 00:00:00 2001 From: Sebastian Andrzej Siewior Date: Sun, 15 Jan 2012 16:52:13 +0100 Subject: [PATCH] fixup of "x86: convert to generic irq_domain" Signed-off-by: Sebastian Andrzej Siewior --- arch/x86/Kconfig | 1 + arch/x86/kernel/devicetree.c | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index d6f1e91..0d74f88 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -397,6 +397,7 @@ config X86_INTEL_CE select X86_REBOOTFIXUPS select OF select OF_EARLY_FLATTREE + select IRQ_DOMAIN ---help--- Select for the Intel CE media processor (CE4100) SOC. This option compiles in support for the CE4100 SOC for settop diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c index 5632e5b..41eb2a7 100644 --- a/arch/x86/kernel/devicetree.c +++ b/arch/x86/kernel/devicetree.c @@ -4,6 +4,7 @@ #include #include #include +#include #include #include #include -- you add my acked-by to it. Sebastian