diff mbox

[Trusty] fix build error in gpio-dwapb patch

Message ID 20140725203650.GB22536@fluid.dannf
State New
Headers show

Commit Message

dann frazier July 25, 2014, 8:36 p.m. UTC 
From: Alan Tull <atull@altera.com>

commit 4f37fbc6c30cd0da059f08b40e04b73a29bdee61 upstream.

BugLink: https://bugs.launchpad.net/bugs/1348808

fix build error with this message:
kernel/irq/Kconfig:41:error: recursive dependency detected!
kernel/irq/Kconfig:41:  symbol GENERIC_IRQ_CHIP is selected by GPIO_DWAPB
drivers/gpio/Kconfig:131:       symbol GPIO_DWAPB depends on IRQ_DOMAIN
kernel/irq/Kconfig:46:  symbol IRQ_DOMAIN is selected by GENERIC_IRQ_CHIP

Signed-off-by: Alan Tull <atull@altera.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: dann.frazier <dann.frazier@canonical.com>
---
 drivers/gpio/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tim Gardner July 25, 2014, 8:48 p.m. UTC | #1 
Actually cherry picked from commit c7861f37b4c63b7f45d37b113acabbf352597c46

Kamal - stable material ?
Kamal Mostafa Aug. 4, 2014, 4:43 p.m. UTC | #2 
On Fri, 2014-07-25 at 14:48 -0600, Tim Gardner wrote:
> Actually cherry picked from commit c7861f37b4c63b7f45d37b113acabbf352597c46
> 
> Kamal - stable material ?

Nope, not this one.  Although Trusty does carry the GPIO_DWAPB driver,
it didn't actually land in mainline until 3.14 (7779b34).  It doesn't
exist in 3.13-stable so no further action needed here.

Thanks anyway!

 -Kamal
diff mbox

Patch

diff --git a/drivers/gpio/Kconfig b/drivers/gpio/Kconfig
index 17760dd..9120b29 100644
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -125,7 +125,7 @@  config GPIO_DWAPB
 	tristate "Synopsys DesignWare APB GPIO driver"
 	select GPIO_GENERIC
 	select GENERIC_IRQ_CHIP
-	depends on OF_GPIO && IRQ_DOMAIN
+	depends on OF_GPIO
 	help
 	  Say Y or M here to build support for the Synopsys DesignWare APB
 	  GPIO block.